From 65bda27d4218d9d4ebf809d91e716c892e1f1d8b Mon Sep 17 00:00:00 2001 From: Ben Loftis Date: Mon, 3 Dec 2018 18:55:52 -0600 Subject: Tweaks to Mixer and Monitor keybindings: Add Mixer-specific view keybindings for list, vca, mon. (thanks to: the_CLA) Move monitor keybindings (mute, dim, mono) to be globally-accessible. Implement new mixer-specific actions to show/hide monitor,vcas,mixbuses (the_CLA) Move monitor funcs (mute,dim,mono) to globally-accessible actions. Make a new Monitor group insted of using Transport group. Allow use-monitor-section to be controlled by both menu and session-options dialog. --- gtk2_ardour/monitor_section.cc | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'gtk2_ardour/monitor_section.cc') diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index e52b48c7c7..1fb8f79f72 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -927,15 +927,6 @@ MonitorSection::register_actions () monitor_actions = myactions.create_action_group (X_("Monitor")); - myactions.register_toggle_action (monitor_actions, "monitor-mono", _("Switch monitor to mono"), - sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), MonitorMono)); - - myactions.register_toggle_action (monitor_actions, "monitor-cut-all", _("Cut monitor"), - sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), MonitorCutAll)); - - myactions.register_toggle_action (monitor_actions, "monitor-dim-all", _("Dim monitor"), - sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), MonitorDimAll)); - act = myactions.register_toggle_action (monitor_actions, "toggle-exclusive-solo", _("Toggle exclusive solo mode"), sigc::bind (sigc::ptr_fun (MonitorSection::action_proxy0), ToggleExclusiveSolo)); @@ -1103,13 +1094,14 @@ MonitorSection::map_state () return; } - Glib::RefPtr act; - update_solo_model (); + Glib::RefPtr act; + Glib::RefPtr tact; + act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all"); if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + tact = Glib::RefPtr::cast_dynamic (act); if (tact) { tact->set_active (_monitor->cut_all()); } @@ -1117,7 +1109,7 @@ MonitorSection::map_state () act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all"); if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + tact = Glib::RefPtr::cast_dynamic (act); if (tact) { tact->set_active (_monitor->dim_all()); } @@ -1125,7 +1117,7 @@ MonitorSection::map_state () act = ActionManager::get_action (X_("Monitor"), "monitor-mono"); if (act) { - Glib::RefPtr tact = Glib::RefPtr::cast_dynamic (act); + tact = Glib::RefPtr::cast_dynamic (act); if (tact) { tact->set_active (_monitor->mono()); } -- cgit v1.2.3