Implements review comments
[ardour.git] / gtk2_ardour / monitor_section.cc
index e508bf0909c6afada87e111eff6d30687aac5583..af2168881376f5290dcb58f7c498e9dc1f65453e 100644 (file)
@@ -26,7 +26,6 @@
 #include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
-#include "gtkmm2ext/motionfeedback.h"
 #include "gtkmm2ext/utils.h"
 
 #include <gtkmm/menu.h>
@@ -45,7 +44,6 @@
 #include "public_editor.h"
 #include "timers.h"
 #include "tooltips.h"
-#include "volume_controller.h"
 #include "ui_config.h"
 #include "utils.h"
 
@@ -85,6 +83,8 @@ MonitorSection::MonitorSection (Session* s)
        , toggle_processorbox_button (ArdourButton::default_elements)
        , _inhibit_solo_model_update (false)
        , _ui_initialized (false)
+       , myactions (X_("monitor section"))
+       , bindings (0)
 {
 
        using namespace Menu_Helpers;
@@ -92,11 +92,8 @@ MonitorSection::MonitorSection (Session* s)
        Glib::RefPtr<Action> act;
 
        if (!monitor_actions) {
-
-               /* do some static stuff */
-
                register_actions ();
-
+               load_bindings ();
        }
 
        _plugin_selector = new PluginSelector (PluginManager::instance());
@@ -186,11 +183,10 @@ MonitorSection::MonitorSection (Session* s)
        /* Processor Box hide/shos */
        toggle_processorbox_button.set_text (_("Processors"));
        toggle_processorbox_button.set_name (X_("monitor section processors toggle"));
-       set_tooltip (&toggle_processorbox_button, _("Allow to add monitor effect processors"));
+       set_tooltip (&toggle_processorbox_button, _("Allow one to add monitor effect processors"));
 
-       proctoggle = ToggleAction::create ();
+       proctoggle = ActionManager::get_action (X_("Monitor"), X_("toggle-monitor-processor-box"));
        toggle_processorbox_button.set_related_action (proctoggle);
-       proctoggle->signal_toggled().connect (sigc::mem_fun(*this, &MonitorSection::update_processor_box), false);
 
        /* Knobs */
        Label* solo_boost_label;
@@ -470,7 +466,7 @@ MonitorSection::MonitorSection (Session* s)
                _tearoff->tearoff_window().set_type_hint (Gdk::WINDOW_TYPE_HINT_NORMAL);
        }
        _tearoff->tearoff_window().set_title (X_("Monitor"));
-       _tearoff->tearoff_window().signal_key_press_event().connect (sigc::ptr_fun (forward_key_press), false);
+       _tearoff->tearoff_window().signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), (Gtk::Window*) &_tearoff->tearoff_window()), false);
 
        update_output_display ();
        update_processor_box ();
@@ -511,7 +507,7 @@ MonitorSection::~MonitorSection ()
 void
 MonitorSection::update_processor_box ()
 {
-       bool show_processor_box = proctoggle->get_active ();
+       bool show_processor_box = Glib::RefPtr<ToggleAction>::cast_dynamic (proctoggle)->get_active ();
 
        if (count_processors () > 0 && !show_processor_box) {
                toggle_processorbox_button.set_name (X_("monitor section processors present"));
@@ -679,25 +675,25 @@ MonitorSection::populate_buttons ()
                channel_table.attach (cbs->solo, 3, 4, i+row_offset, i+row_offset+1, EXPAND|FILL);
                channel_table.attach (cbs->invert, 4, 5, i+row_offset, i+row_offset+1, EXPAND|FILL);
 
-               snprintf (buf, sizeof (buf), "monitor-cut-%u", i+1);
+               snprintf (buf, sizeof (buf), "monitor-cut-%u", i);
                act = ActionManager::get_action (X_("Monitor"), buf);
                if (act) {
                        cbs->cut.set_related_action (act);
                }
 
-               snprintf (buf, sizeof (buf), "monitor-dim-%u", i+1);
+               snprintf (buf, sizeof (buf), "monitor-dim-%u", i);
                act = ActionManager::get_action (X_("Monitor"), buf);
                if (act) {
                        cbs->dim.set_related_action (act);
                }
 
-               snprintf (buf, sizeof (buf), "monitor-solo-%u", i+1);
+               snprintf (buf, sizeof (buf), "monitor-solo-%u", i);
                act = ActionManager::get_action (X_("Monitor"), buf);
                if (act) {
                        cbs->solo.set_related_action (act);
                }
 
-               snprintf (buf, sizeof (buf), "monitor-invert-%u", i+1);
+               snprintf (buf, sizeof (buf), "monitor-invert-%u", i);
                act = ActionManager::get_action (X_("Monitor"), buf);
                if (act) {
                        cbs->invert.set_related_action (act);
@@ -789,8 +785,6 @@ MonitorSection::cut_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-cut-%u", chn);
 
-       --chn; // 0-based in backend
-
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -808,8 +802,6 @@ MonitorSection::dim_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-dim-%u", chn);
 
-       --chn; // 0-based in backend
-
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -828,8 +820,6 @@ MonitorSection::solo_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-solo-%u", chn);
 
-       --chn; // 0-based in backend
-
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -848,8 +838,6 @@ MonitorSection::invert_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-invert-%u", chn);
 
-       --chn; // 0-based in backend
-
        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
        if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@@ -864,69 +852,120 @@ MonitorSection::register_actions ()
        string action_descr;
        Glib::RefPtr<Action> act;
 
-       monitor_actions = ActionGroup::create (X_("Monitor"));
-       ActionManager::add_action_group (monitor_actions);
+       monitor_actions = myactions.create_action_group (X_("Monitor"));
 
-       ActionManager::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));
 
-       ActionManager::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));
 
-       ActionManager::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 = ActionManager::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 = ActionManager::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);
        tact->set_active (Config->get_solo_mute_override());
 
-
-       /* note the 1-based counting (for naming - backend uses 0-based) */
-
-       for (uint32_t chn = 1; chn <= 16; ++chn) {
+       for (uint32_t chn = 0; chn < 16; ++chn) {
 
                action_name = string_compose (X_("monitor-cut-%1"), chn);
                action_descr = string_compose (_("Cut monitor channel %1"), chn);
-               ActionManager::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);
-               ActionManager::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);
-               ActionManager::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);
-               ActionManager::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 = ActionGroup::create (X_("Solo"));
+       Glib::RefPtr<ActionGroup> solo_actions = myactions.create_action_group (X_("Solo"));
        RadioAction::Group solo_group;
 
-       ActionManager::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));
-       ActionManager::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));
-       ActionManager::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));
 
-       ActionManager::add_action_group (solo_actions);
+       myactions.register_toggle_action (monitor_actions, "toggle-monitor-processor-box", _("Toggle Monitor Section Processor Box"),
+                       sigc::mem_fun(*this, &MonitorSection::update_processor_box));
+}
+
+void
+MonitorSection::connect_actions ()
+{
+       Glib::RefPtr<Action> act;
+       Glib::RefPtr<ToggleAction> tact;
+
+#define MON_TOG(NAME, FUNC) \
+       act = ActionManager::get_action (X_("Monitor"), NAME); \
+       tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); \
+       assert (tact); \
+       tact->signal_toggled().connect (sigc::mem_fun (*this, &MonitorSection::FUNC)); \
+
+       MON_TOG("monitor-mono", mono);
+       MON_TOG("monitor-cut-all", cut_all);
+       MON_TOG("monitor-dim-all", dim_all);
+
+       MON_TOG("toggle-exclusive-solo", toggle_exclusive_solo);
+       tact->set_active (Config->get_exclusive_solo());
+
+       MON_TOG("toggle-mute-overrides-solo", toggle_mute_overrides_solo);
+       tact->set_active (Config->get_solo_mute_override());
+#undef MON_TOG
+
+#define MON_BIND(NAME, FUNC, ARG) \
+       act = ActionManager::get_action (X_("Monitor"), NAME); \
+       tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); \
+       assert (tact); \
+       tact->signal_toggled().connect (sigc::bind (sigc::mem_fun (*this, &MonitorSection::FUNC), ARG));
+
+       for (uint32_t chn = 0; chn < 16; ++chn) {
+               std::string action_name = string_compose (X_("monitor-cut-%1"), chn);
+               MON_BIND(action_name.c_str(), cut_channel, chn);
+               action_name = string_compose (X_("monitor-dim-%1"), chn);
+               MON_BIND(action_name.c_str(), dim_channel, chn);
+               action_name = string_compose (X_("monitor-solo-%1"), chn);
+               MON_BIND(action_name.c_str(), solo_channel, chn);
+               action_name = string_compose (X_("monitor-invert-%1"), chn);
+               MON_BIND(action_name.c_str(), invert_channel, chn);
+       }
+#undef MON_BIND
+
+#define SOLO_RADIO(NAME, FUNC) \
+       act = ActionManager::get_action (X_("Solo"), NAME); \
+       ract = Glib::RefPtr<RadioAction>::cast_dynamic (act); \
+       assert (ract); \
+       ract->signal_toggled().connect (sigc::mem_fun (*this, &MonitorSection::FUNC)); \
+
+       Glib::RefPtr<RadioAction> ract;
+       SOLO_RADIO ("solo-use-in-place", solo_use_in_place);
+       SOLO_RADIO ("solo-use-afl", solo_use_afl);
+       SOLO_RADIO ("solo-use-pfl", solo_use_pfl);
+#undef SOLO_RADIO
 }
 
 void
@@ -1168,7 +1207,7 @@ MonitorSection::cancel_isolate (GdkEventButton*)
 {
        if (_session) {
                boost::shared_ptr<RouteList> rl (_session->get_routes ());
-               _session->set_solo_isolated (rl, false, Session::rt_cleanup, true);
+               _session->set_solo_isolated (rl, false, Session::rt_cleanup, Controllable::NoGroup);
        }
 
        return true;
@@ -1588,6 +1627,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
 {