diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-08-10 14:31:59 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:24 -0500 |
commit | 949163f80610af76edc2c1878dfb00bae2de316a (patch) | |
tree | ce5c0e8c5c5e4f3eb37fd57d37931222c2d5d521 /gtk2_ardour/monitor_section.cc | |
parent | 67e19c177f473807cd6510751bcf4a48574e6088 (diff) |
more changes to Bindings, Keyboard APIs
Diffstat (limited to 'gtk2_ardour/monitor_section.cc')
-rw-r--r-- | gtk2_ardour/monitor_section.cc | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc index 0bc5b98bc7..9b12723ac5 100644 --- a/gtk2_ardour/monitor_section.cc +++ b/gtk2_ardour/monitor_section.cc @@ -83,6 +83,7 @@ MonitorSection::MonitorSection (Session* s) , toggle_processorbox_button (ArdourButton::default_elements) , _inhibit_solo_model_update (false) , _ui_initialized (false) + , bindings (0) { using namespace Menu_Helpers; @@ -91,8 +92,7 @@ MonitorSection::MonitorSection (Session* s) if (!monitor_actions) { register_actions (); - } else { - connect_actions (); + load_bindings (); } _plugin_selector = new PluginSelector (PluginManager::instance()); @@ -852,24 +852,24 @@ MonitorSection::register_actions () string action_descr; Glib::RefPtr<Action> act; - monitor_actions = Actions.create_action_group (X_("Monitor")); + monitor_actions = myactions.create_action_group (X_("Monitor")); - Actions.register_toggle_action (monitor_actions, "monitor-mono", _("Switch monitor to mono"), + myactions.register_toggle_action (monitor_actions, "monitor-mono", _("Switch monitor to mono"), sigc::mem_fun (*this, &MonitorSection::mono)); - Actions.register_toggle_action (monitor_actions, "monitor-cut-all", _("Cut monitor"), + myactions.register_toggle_action (monitor_actions, "monitor-cut-all", _("Cut monitor"), sigc::mem_fun (*this, &MonitorSection::cut_all)); - Actions.register_toggle_action (monitor_actions, "monitor-dim-all", _("Dim monitor"), + myactions.register_toggle_action (monitor_actions, "monitor-dim-all", _("Dim monitor"), sigc::mem_fun (*this, &MonitorSection::dim_all)); - act = Actions.register_toggle_action (monitor_actions, "toggle-exclusive-solo", _("Toggle exclusive solo mode"), + act = myactions.register_toggle_action (monitor_actions, "toggle-exclusive-solo", _("Toggle exclusive solo mode"), sigc::mem_fun (*this, &MonitorSection::toggle_exclusive_solo)); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); tact->set_active (Config->get_exclusive_solo()); - act = Actions.register_toggle_action (monitor_actions, "toggle-mute-overrides-solo", _("Toggle mute overrides solo mode"), + act = myactions.register_toggle_action (monitor_actions, "toggle-mute-overrides-solo", _("Toggle mute overrides solo mode"), sigc::mem_fun (*this, &MonitorSection::toggle_mute_overrides_solo)); tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); @@ -879,35 +879,35 @@ MonitorSection::register_actions () action_name = string_compose (X_("monitor-cut-%1"), chn); action_descr = string_compose (_("Cut monitor channel %1"), chn); - Actions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), sigc::bind (sigc::mem_fun (*this, &MonitorSection::cut_channel), chn)); action_name = string_compose (X_("monitor-dim-%1"), chn); action_descr = string_compose (_("Dim monitor channel %1"), chn); - Actions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), sigc::bind (sigc::mem_fun (*this, &MonitorSection::dim_channel), chn)); action_name = string_compose (X_("monitor-solo-%1"), chn); action_descr = string_compose (_("Solo monitor channel %1"), chn); - Actions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), sigc::bind (sigc::mem_fun (*this, &MonitorSection::solo_channel), chn)); action_name = string_compose (X_("monitor-invert-%1"), chn); action_descr = string_compose (_("Invert monitor channel %1"), chn); - Actions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), + myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(), sigc::bind (sigc::mem_fun (*this, &MonitorSection::invert_channel), chn)); } - Glib::RefPtr<ActionGroup> solo_actions = Actions.create_action_group (X_("Solo")); + Glib::RefPtr<ActionGroup> solo_actions = myactions.create_action_group (X_("Solo")); RadioAction::Group solo_group; - Actions.register_radio_action (solo_actions, solo_group, "solo-use-in-place", _("In-place solo"), + myactions.register_radio_action (solo_actions, solo_group, "solo-use-in-place", _("In-place solo"), sigc::mem_fun (*this, &MonitorSection::solo_use_in_place)); - Actions.register_radio_action (solo_actions, solo_group, "solo-use-afl", _("After Fade Listen (AFL) solo"), + myactions.register_radio_action (solo_actions, solo_group, "solo-use-afl", _("After Fade Listen (AFL) solo"), sigc::mem_fun (*this, &MonitorSection::solo_use_afl)); - Actions.register_radio_action (solo_actions, solo_group, "solo-use-pfl", _("Pre Fade Listen (PFL) solo"), + myactions.register_radio_action (solo_actions, solo_group, "solo-use-pfl", _("Pre Fade Listen (PFL) solo"), sigc::mem_fun (*this, &MonitorSection::solo_use_pfl)); } @@ -1625,6 +1625,12 @@ MonitorSection::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost: } void +MonitorSection::load_bindings () +{ + bindings = Bindings::get_bindings (X_("monitor-section"), myactions); +} + +void MonitorSection::help_count_processors (boost::weak_ptr<Processor> p, uint32_t* cnt) const { boost::shared_ptr<Processor> processor (p.lock ()); |