replace ::cast_dynamic() with relevant ActionManager::get_*_action() calls
[ardour.git] / gtk2_ardour / monitor_section.cc
index 2fcc5812b7d049494d30275283a10b7acd252059..7a304d96ace37b62b72902175c81be3f32c2ecc9 100644 (file)
 #include "pbd/error.h"
 #include "pbd/replace_all.h"
 
-#include "gtkmm2ext/bindable_button.h"
-#include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/utils.h"
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
 
+#include "widgets/tearoff.h"
+#include "widgets/tooltips.h"
+
 #include "ardour/amp.h"
 #include "ardour/audioengine.h"
 #include "ardour/monitor_processor.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
+#include "mixer_ui.h"
 #include "monitor_section.h"
 #include "public_editor.h"
 #include "timers.h"
-#include "tooltips.h"
 #include "ui_config.h"
 #include "utils.h"
 
 #include "pbd/i18n.h"
 
 using namespace ARDOUR;
+using namespace ArdourWidgets;
 using namespace ARDOUR_UI_UTILS;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace PBD;
 using namespace std;
 
-Glib::RefPtr<ActionGroup> MonitorSection::monitor_actions;
-
 #define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))
 
-MonitorSection::MonitorSection (Session* s)
-       : SessionHandlePtr (s)
-       , RouteUI (s)
+MonitorSection::MonitorSection ()
+       : RouteUI ((Session*) 0)
        , _tearoff (0)
+       , channel_table (0)
        , channel_table_viewport (*channel_table_scroller.get_hadjustment()
                                  , *channel_table_scroller.get_vadjustment ())
        , gain_control (0)
@@ -84,22 +84,23 @@ MonitorSection::MonitorSection (Session* s)
        , solo_mute_override_button (ArdourButton::led_default_elements)
        , toggle_processorbox_button (ArdourButton::default_elements)
        , _inhibit_solo_model_update (false)
+       , _rr_selection ()
        , _ui_initialized (false)
-       , myactions (X_("monitor section"))
-       , bindings (0)
 {
-
+       /* note that although this a RouteUI, we never called ::set_route() so
+        * we do not need to worry about self-destructing when the Route (the
+        * monitor out) is destroyed.
+        */
+       
        using namespace Menu_Helpers;
 
        Glib::RefPtr<Action> act;
 
-       if (!monitor_actions) {
-               register_actions ();
-               load_bindings ();
-               if (bindings) {
-                       set_data ("ardour-bindings", bindings);
-               }
-       }
+       load_bindings ();
+       register_actions ();
+       set_data ("ardour-bindings", bindings);
+
+       channel_size_group = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
 
        _plugin_selector = new PluginSelector (PluginManager::instance());
        insert_box = new ProcessorBox (_session, boost::bind (&MonitorSection::plugin_selector, this), _rr_selection, 0);
@@ -107,8 +108,6 @@ MonitorSection::MonitorSection (Session* s)
        insert_box->show ();
        // TODO allow keyboard shortcuts in ProcessorBox
 
-       set_session (s);
-
        /* Rude Solo  & Solo Isolated */
        rude_solo_button.set_text (_("Soloing"));
        rude_solo_button.set_name ("rude solo");
@@ -124,8 +123,6 @@ MonitorSection::MonitorSection (Session* s)
 
        Timers::blink_connect (sigc::mem_fun (*this, &MonitorSection::do_blink));
 
-       act = ActionManager::get_action (X_("Main"), X_("cancel-solo"));
-       rude_solo_button.set_related_action (act);
        UI::instance()->set_tip (rude_solo_button, _("When active, something is soloed.\nClick to de-solo everything"));
 
        rude_iso_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_isolate), false);
@@ -171,7 +168,7 @@ MonitorSection::MonitorSection (Session* s)
        exclusive_solo_button.set_name (X_("monitor section solo option"));
        set_tooltip (&exclusive_solo_button, _("Exclusive solo means that only 1 solo is active at a time"));
 
-       act = ActionManager::get_action (X_("Monitor"), X_("toggle-exclusive-solo"));
+       act = ActionManager::get_action (X_("Solo"), X_("toggle-exclusive-solo"));
        if (act) {
                exclusive_solo_button.set_related_action (act);
        }
@@ -180,17 +177,14 @@ MonitorSection::MonitorSection (Session* s)
        solo_mute_override_button.set_name (X_("monitor section solo option"));
        set_tooltip (&solo_mute_override_button, _("If enabled, solo will override mute\n(a soloed & muted track or bus will be audible)"));
 
-       act = ActionManager::get_action (X_("Monitor"), X_("toggle-mute-overrides-solo"));
-       if (act) {
-               solo_mute_override_button.set_related_action (act);
-       }
+       solo_mute_override_button.set_related_action (ActionManager::get_action (X_("Solo"), X_("toggle-mute-overrides-solo")));
 
        /* 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 one to add monitor effect processors"));
 
-       proctoggle = ActionManager::get_action (X_("Monitor"), X_("toggle-monitor-processor-box"));
+       proctoggle = ActionManager::get_toggle_action (X_("Monitor"), X_("toggle-monitor-processor-box"));
        toggle_processorbox_button.set_related_action (proctoggle);
 
        /* Knobs */
@@ -308,10 +302,7 @@ MonitorSection::MonitorSection (Session* s)
        channel_table_scroller.show ();
        channel_table_scroller.add (channel_table_viewport);
 
-       channel_size_group  = SizeGroup::create (SIZE_GROUP_HORIZONTAL);
        channel_size_group->add_widget (channel_table_header);
-       channel_size_group->add_widget (channel_table);
-
        channel_table_header.resize (1, 5);
 
        Label* l1 = manage (new Label (X_("  ")));
@@ -384,10 +375,6 @@ MonitorSection::MonitorSection (Session* s)
        level_tbl->attach (*dim_control,         1, 3, 4, 5, EXPAND|FILL, SHRINK, 1, 2);
        level_tbl->attach (*dim_display,         1, 3, 5, 6, EXPAND     , SHRINK, 1, 2);
 
-       /* note that we don't pack the table_hpacker till later
-        * -> top level channel_table_packer */
-       table_hpacker.pack_start (channel_table, true, true);
-
        // mono, dim
        HBox* mono_dim_box = manage (new HBox);
        mono_dim_box->set_spacing (PX_SCALE(4));
@@ -412,6 +399,18 @@ MonitorSection::MonitorSection (Session* s)
        lower_packer->pack_start (*mono_dim_box,        false, false, PX_SCALE(2));
        lower_packer->pack_start (cut_all_button,       false, false, PX_SCALE(2));
 
+       // calc height of mixer scrollbar
+       int scrollbar_height = 0;
+       {
+               Gtk::Window window (WINDOW_TOPLEVEL);
+               HScrollbar scrollbar;
+               window.add (scrollbar);
+               scrollbar.set_name ("MixerWindow");
+               scrollbar.ensure_style();
+               Gtk::Requisition requisition(scrollbar.size_request ());
+               scrollbar_height = requisition.height;
+       }
+
        // output port select
        VBox* out_packer = manage (new VBox);
        out_packer->set_spacing (PX_SCALE(2));
@@ -429,7 +428,13 @@ MonitorSection::MonitorSection (Session* s)
        vpacker.pack_start (*level_tbl,           false, false, PX_SCALE(8));
        vpacker.pack_start (*lower_packer,        false, false, PX_SCALE(8));
        vpacker.pack_start (master_packer,        false, false, PX_SCALE(10));
-       vpacker.pack_end   (*out_packer,          false, false, PX_SCALE(3));
+       vpacker.pack_end   (*out_packer,          false, false,
+#ifdef MIXBUS
+                       scrollbar_height - 2 /* no outer sample */
+#else
+                       scrollbar_height + 2 /* sample borders */
+#endif
+                       );
 
        hpacker.set_spacing (0);
        hpacker.pack_start (vpacker, true, true);
@@ -446,7 +451,6 @@ MonitorSection::MonitorSection (Session* s)
        mono_dim_box->show ();
        spin_packer->show ();
        master_packer.show ();
-       channel_table.show ();
 
        rude_box->show();
        solo_tbl->show_all();
@@ -457,7 +461,6 @@ MonitorSection::MonitorSection (Session* s)
        vpacker.show ();
        hpacker.show ();
 
-       populate_buttons ();
        map_state ();
        assign_controllables ();
 
@@ -497,7 +500,7 @@ MonitorSection::~MonitorSection ()
        }
 
        _channel_buttons.clear ();
-       _output_changed_connection.disconnect ();
+       output_changed_connections.drop_connections ();
 
        delete insert_box; insert_box = 0;
        delete output_button; output_button = 0;
@@ -511,6 +514,7 @@ MonitorSection::~MonitorSection ()
        delete solo_cut_display; solo_cut_display = 0;
        delete _tearoff; _tearoff = 0;
        delete _output_selector; _output_selector = 0;
+       delete channel_table; channel_table = 0;
 }
 
 bool
@@ -547,7 +551,7 @@ MonitorSection::leave_handler (GdkEventCrossing* ev)
 void
 MonitorSection::update_processor_box ()
 {
-       bool show_processor_box = Glib::RefPtr<ToggleAction>::cast_dynamic (proctoggle)->get_active ();
+       bool show_processor_box = proctoggle->get_active ();
 
        if (count_processors () > 0 && !show_processor_box) {
                toggle_processorbox_button.set_name (X_("monitor section processors present"));
@@ -582,80 +586,80 @@ MonitorSection::set_session (Session* s)
 
        if (_session) {
 
+               /* These are not actually dependent on the Session, but they
+                * need to be set after construction, not during, and
+                * this is as good a place as any.
+                */
+
+               ActionManager::get_toggle_action (X_("Solo"), X_("toggle-exclusive-solo"))->set_active (Config->get_exclusive_solo());
+               ActionManager::get_toggle_action (X_("Solo"), X_("toggle-mute-overrides-solo"))->set_active (Config->get_solo_mute_override());
+
                _route = _session->monitor_out ();
 
                if (_route) {
                        /* session with monitor section */
                        _monitor = _route->monitor_control ();
                        assign_controllables ();
-                       _route->output()->changed.connect (_output_changed_connection, invalidator (*this),
+                       _route->output()->changed.connect (output_changed_connections, invalidator (*this),
                                                                                        boost::bind (&MonitorSection::update_output_display, this),
                                                                                        gui_context());
                        insert_box->set_route (_route);
                        _route->processors_changed.connect (*this, invalidator (*this), boost::bind (&MonitorSection::processors_changed, this, _1), gui_context());
+                       _route->output()->PortCountChanged.connect (output_changed_connections, invalidator (*this), boost::bind (&MonitorSection::populate_buttons, this), gui_context());
+                       _route->DropReferences.connect (*this, invalidator (*this), boost::bind (&MonitorSection::drop_route, this), gui_context());
+
                        if (_ui_initialized) {
                                update_processor_box ();
                        }
+
+                       ActionManager::set_sensitive (monitor_actions, true);
+                       ActionManager::set_sensitive (solo_actions, true);
+
                } else {
                        /* session with no monitor section */
-                       _output_changed_connection.disconnect();
+                       output_changed_connections.drop_connections();
                        _monitor.reset ();
                        _route.reset ();
                        delete _output_selector;
                        _output_selector = 0;
-               }
-
-               if (channel_table_scroller.get_parent()) {
-                       /* scroller is packed, so remove it */
-                       channel_table_packer.remove (channel_table_scroller);
-               }
 
-               if (table_hpacker.get_parent () == &channel_table_packer) {
-                       /* this occurs when the table hpacker is directly
-                                packed, so remove it.
-                                */
-                       channel_table_packer.remove (table_hpacker);
-               } else if (table_hpacker.get_parent()) {
-                       channel_table_viewport.remove ();
+                       ActionManager::set_sensitive (monitor_actions, false);
+                       /* this action needs to always be true in this * scenaro, so that we can turn it back on*/
+                       ActionManager::get_toggle_action (X_("Monitor"), X_("UseMonitorSection"))->set_sensitive (true);
+                       ActionManager::set_sensitive (solo_actions, true);
                }
 
-               if (_monitor->output_streams().n_audio() > 7) {
-                       /* put the table into a scrolled window, and then put
-                        * that into the channel vpacker, after the table header
-                        */
-                       channel_table_viewport.add (table_hpacker);
-                       channel_table_packer.pack_start (channel_table_scroller, true, true);
-                       channel_table_viewport.show ();
-                       channel_table_scroller.show ();
-
-               } else {
-                       /* just put the channel table itself into the channel
-                        * vpacker, after the table header
-                        */
+               /* make sure the state of this action reflects reality */
+               ActionManager::get_toggle_action (X_("Monitor"), X_("UseMonitorSection"))->set_active (_route != 0);
 
-                       channel_table_packer.pack_start (table_hpacker, true, true);
-                       channel_table_scroller.hide ();
-               }
+               populate_buttons ();
 
-               table_hpacker.show ();
-               channel_table.show ();
 
        } else {
-               /* no session */
 
-               _output_changed_connection.disconnect();
-               _monitor.reset ();
-               _route.reset ();
-               control_connections.drop_connections ();
-               rude_iso_button.unset_active_state ();
-               rude_solo_button.unset_active_state ();
-               delete _output_selector;
-               _output_selector = 0;
+               /* no session */
 
+               drop_route ();
                assign_controllables ();
+
+               ActionManager::set_sensitive (monitor_actions, false);
+               ActionManager::set_sensitive (solo_actions, false);
        }
 }
 
+void
+MonitorSection::drop_route ()
+{
+       output_changed_connections.drop_connections();
+       _monitor.reset ();
+       _route.reset ();
+       control_connections.drop_connections ();
+       rude_iso_button.unset_active_state ();
+       rude_solo_button.unset_active_state ();
+       delete _output_selector;
+       _output_selector = 0;
+}
+
 MonitorSection::ChannelButtonSet::ChannelButtonSet ()
 {
        cut.set_name (X_("mute button"));
@@ -669,20 +673,37 @@ MonitorSection::ChannelButtonSet::ChannelButtonSet ()
        invert.unset_flags (Gtk::CAN_FOCUS);
 }
 
-       void
+void
 MonitorSection::populate_buttons ()
 {
        if (!_monitor) {
                return;
        }
 
+       if (channel_table) {
+               channel_size_group->remove_widget (*channel_table);
+               delete channel_table;
+       }
+
+       channel_table = new Gtk::Table();
+
+       channel_table->set_col_spacings (6);
+       channel_table->set_row_spacings (6);
+       channel_table->set_homogeneous (true);
+
+       channel_size_group->add_widget (*channel_table);
+       channel_table->show ();
+       table_hpacker.pack_start (*channel_table, true, true);
+
+       for (ChannelButtons::iterator i = _channel_buttons.begin(); i != _channel_buttons.end(); ++i) {
+               delete *i;
+       }
+       _channel_buttons.clear ();
+
        Glib::RefPtr<Action> act;
        uint32_t nchans = _monitor->output_streams().n_audio();
 
-       channel_table.resize (nchans, 5);
-       channel_table.set_col_spacings (6);
-       channel_table.set_row_spacings (6);
-       channel_table.set_homogeneous (true);
+       channel_table->resize (nchans, 5);
 
        const uint32_t row_offset = 0;
 
@@ -704,16 +725,16 @@ MonitorSection::populate_buttons ()
                }
 
                Label* label = manage (new Label (l));
-               channel_table.attach (*label, 0, 1, i+row_offset, i+row_offset+1, EXPAND|FILL);
+               channel_table->attach (*label, 0, 1, i+row_offset, i+row_offset+1, EXPAND|FILL);
 
                ChannelButtonSet* cbs = new ChannelButtonSet;
 
                _channel_buttons.push_back (cbs);
 
-               channel_table.attach (cbs->cut, 1, 2, i+row_offset, i+row_offset+1, EXPAND|FILL);
-               channel_table.attach (cbs->dim, 2, 3, i+row_offset, i+row_offset+1, EXPAND|FILL);
-               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);
+               channel_table->attach (cbs->cut, 1, 2, i+row_offset, i+row_offset+1, EXPAND|FILL);
+               channel_table->attach (cbs->dim, 2, 3, i+row_offset, i+row_offset+1, EXPAND|FILL);
+               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);
                act = ActionManager::get_action (X_("Monitor"), buf);
@@ -740,7 +761,40 @@ MonitorSection::populate_buttons ()
                }
        }
 
-       channel_table.show_all ();
+       channel_table->show_all ();
+
+       if (channel_table_scroller.get_parent()) {
+               /* scroller is packed, so remove it */
+               channel_table_packer.remove (channel_table_scroller);
+       }
+
+       if (table_hpacker.get_parent () == &channel_table_packer) {
+               /* this occurs when the table hpacker is directly
+                        packed, so remove it.
+                        */
+               channel_table_packer.remove (table_hpacker);
+       } else if (table_hpacker.get_parent()) {
+               channel_table_viewport.remove ();
+       }
+
+       if (nchans > 7) {
+               /* put the table into a scrolled window, and then put
+                * that into the channel vpacker, after the table header
+                */
+               channel_table_viewport.add (table_hpacker);
+               channel_table_packer.pack_start (channel_table_scroller, true, true);
+               channel_table_viewport.show ();
+               channel_table_scroller.show ();
+
+       } else {
+               /* just put the channel table itself into the channel
+                * vpacker, after the table header
+                */
+               channel_table_packer.pack_start (table_hpacker, true, true);
+               channel_table_scroller.hide ();
+       }
+       table_hpacker.show ();
+       channel_table->show ();
 }
 
 void
@@ -750,12 +804,7 @@ MonitorSection::toggle_exclusive_solo ()
                return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "toggle-exclusive-solo");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               Config->set_exclusive_solo (tact->get_active());
-       }
-
+       Config->set_exclusive_solo (ActionManager::get_toggle_action (X_("Solo"), "toggle-exclusive-solo")->get_active());
 }
 
 void
@@ -765,11 +814,8 @@ MonitorSection::toggle_mute_overrides_solo ()
                return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "toggle-mute-overrides-solo");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               Config->set_solo_mute_override (tact->get_active());
-       }
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Solo"), "toggle-mute-overrides-solo");
+       Config->set_solo_mute_override (tact->get_active());
 }
 
 void
@@ -779,12 +825,8 @@ MonitorSection::dim_all ()
                return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_dim_all (tact->get_active());
-       }
-
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-dim-all");
+       _monitor->set_dim_all (tact->get_active());
 }
 
 void
@@ -794,11 +836,8 @@ MonitorSection::cut_all ()
                return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_cut_all (tact->get_active());
-       }
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-cut-all");
+       _monitor->set_cut_all (tact->get_active());
 }
 
 void
@@ -808,11 +847,8 @@ MonitorSection::mono ()
                return;
        }
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), "monitor-mono");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_mono (tact->get_active());
-       }
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono");
+       _monitor->set_mono (tact->get_active());
 }
 
 void
@@ -825,11 +861,8 @@ MonitorSection::cut_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-cut-%u", chn);
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_cut (chn, tact->get_active());
-       }
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
+       _monitor->set_cut (chn, tact->get_active());
 }
 
 void
@@ -842,12 +875,8 @@ MonitorSection::dim_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-dim-%u", chn);
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_dim (chn, tact->get_active());
-       }
-
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
+       _monitor->set_dim (chn, tact->get_active());
 }
 
 void
@@ -860,11 +889,8 @@ MonitorSection::solo_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-solo-%u", chn);
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_solo (chn, tact->get_active());
-       }
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
+       _monitor->set_solo (chn, tact->get_active());
 
 }
 
@@ -878,11 +904,8 @@ MonitorSection::invert_channel (uint32_t chn)
        char buf[64];
        snprintf (buf, sizeof (buf), "monitor-invert-%u", chn);
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Monitor"), buf);
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-               _monitor->set_polarity (chn, tact->get_active());
-       }
+       Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Monitor"), buf);
+       _monitor->set_polarity (chn, tact->get_active());
 }
 
 void
@@ -892,120 +915,58 @@ MonitorSection::register_actions ()
        string action_descr;
        Glib::RefPtr<Action> act;
 
-       monitor_actions = myactions.create_action_group (X_("Monitor"));
-
-       myactions.register_toggle_action (monitor_actions, "monitor-mono", _("Switch monitor to mono"),
-                       sigc::mem_fun (*this, &MonitorSection::mono));
-
-       myactions.register_toggle_action (monitor_actions, "monitor-cut-all", _("Cut monitor"),
-                       sigc::mem_fun (*this, &MonitorSection::cut_all));
+       /* ...will get sensitized if a mon-session is added */
 
-       myactions.register_toggle_action (monitor_actions, "monitor-dim-all", _("Dim monitor"),
-                       sigc::mem_fun (*this, &MonitorSection::dim_all));
+       monitor_actions = ActionManager::create_action_group (bindings, X_("Monitor"));
+       solo_actions = ActionManager::create_action_group (bindings, X_("Monitor"));
 
-       act = myactions.register_toggle_action (monitor_actions, "toggle-exclusive-solo", _("Toggle exclusive solo mode"),
-                       sigc::mem_fun (*this, &MonitorSection::toggle_exclusive_solo));
+       ActionManager::register_toggle_action (monitor_actions, X_("UseMonitorSection"), _("Use Monitor Section"), sigc::mem_fun(*this, &MonitorSection::toggle_use_monitor_section));
+       ActionManager::register_toggle_action (monitor_actions, "monitor-mono", _("Monitor Section: Mono"), sigc::mem_fun (*this, &MonitorSection::mono));
+       ActionManager::register_toggle_action (monitor_actions, "monitor-cut-all", _("Monitor Section: Mute"), sigc::mem_fun (*this, &MonitorSection::cut_all));
+       ActionManager::register_toggle_action (monitor_actions, "monitor-dim-all", _("Monitor Section: Dim"), sigc::mem_fun (*this, &MonitorSection::dim_all));
 
-       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
-       tact->set_active (Config->get_exclusive_solo());
+       ActionManager::register_toggle_action (monitor_actions, "toggle-monitor-processor-box", _("Toggle Monitor Section Processor Box"),
+                                              sigc::mem_fun (*this, &MonitorSection::update_processor_box));
 
-       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());
 
        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);
-               myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(),
-                               sigc::bind (sigc::mem_fun (*this, &MonitorSection::cut_channel), chn));
+               ActionManager::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);
-               myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(),
-                               sigc::bind (sigc::mem_fun (*this, &MonitorSection::dim_channel), chn));
+               ActionManager::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);
-               myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(),
-                               sigc::bind (sigc::mem_fun (*this, &MonitorSection::solo_channel), chn));
+               ActionManager::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);
-               myactions.register_toggle_action (monitor_actions, action_name.c_str(), action_descr.c_str(),
-                               sigc::bind (sigc::mem_fun (*this, &MonitorSection::invert_channel), chn));
+               ActionManager::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 = myactions.create_action_group (X_("Solo"));
+       solo_actions = ActionManager::create_action_group (bindings, X_("Solo"));
        RadioAction::Group solo_group;
 
-       myactions.register_radio_action (solo_actions, solo_group, "solo-use-in-place", _("In-place solo"),
-                       sigc::mem_fun (*this, &MonitorSection::solo_use_in_place));
-       myactions.register_radio_action (solo_actions, solo_group, "solo-use-afl", _("After Fade Listen (AFL) solo"),
-                       sigc::mem_fun (*this, &MonitorSection::solo_use_afl));
-       myactions.register_radio_action (solo_actions, solo_group, "solo-use-pfl", _("Pre Fade Listen (PFL) solo"),
-                       sigc::mem_fun (*this, &MonitorSection::solo_use_pfl));
-
-       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
+       ActionManager::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"),
+                                             sigc::mem_fun (*this, &MonitorSection::solo_use_afl));
+       ActionManager::register_radio_action (solo_actions, solo_group, "solo-use-pfl", _("Pre Fade Listen (PFL) solo"),
+                                             sigc::mem_fun (*this, &MonitorSection::solo_use_pfl));
+
+       ActionManager::register_toggle_action (solo_actions, "toggle-exclusive-solo", _("Toggle exclusive solo mode"),
+                                              sigc::mem_fun (*this, &MonitorSection::toggle_exclusive_solo));
+       ActionManager::register_toggle_action (solo_actions, "toggle-mute-overrides-solo", _("Toggle mute overrides solo mode"),
+                                              sigc::mem_fun (*this, &MonitorSection::toggle_mute_overrides_solo));
 }
 
 void
@@ -1016,23 +977,17 @@ MonitorSection::solo_use_in_place ()
                 active.
                 */
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-in-place"));
-
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
-               if (ract) {
-                       if (!ract->get_active ()) {
-                               /* We are turning SiP off, which means that AFL or PFL will be turned on
-                                        shortly; don't update the solo model in the mean time, as if the currently
-                                        configured listen position is not the one that is about to be turned on,
-                                        things will go wrong.
-                                        */
-                               _inhibit_solo_model_update = true;
-                       }
-                       Config->set_solo_control_is_listen_control (!ract->get_active());
-                       _inhibit_solo_model_update = false;
-               }
-       }
+       Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Solo"), X_("solo-use-in-place"));
+       if (!ract->get_active ()) {
+               /* We are turning SiP off, which means that AFL or PFL will be turned on
+                  shortly; don't update the solo model in the mean time, as if the currently
+                  configured listen position is not the one that is about to be turned on,
+                  things will go wrong.
+               */
+               _inhibit_solo_model_update = true;
+       }
+       Config->set_solo_control_is_listen_control (!ract->get_active());
+       _inhibit_solo_model_update = false;
 }
 
 void
@@ -1043,15 +998,10 @@ MonitorSection::solo_use_afl ()
                 active.
                 */
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-afl"));
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
-               if (ract) {
-                       if (ract->get_active()) {
-                               Config->set_solo_control_is_listen_control (true);
-                               Config->set_listen_position (AfterFaderListen);
-                       }
-               }
+       Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Solo"), X_("solo-use-afl"));
+       if (ract->get_active()) {
+               Config->set_solo_control_is_listen_control (true);
+               Config->set_listen_position (AfterFaderListen);
        }
 }
 
@@ -1063,15 +1013,10 @@ MonitorSection::solo_use_pfl ()
           active.
        */
 
-       Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-pfl"));
-       if (act) {
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
-               if (ract) {
-                       if (ract->get_active()) {
-                               Config->set_solo_control_is_listen_control (true);
-                               Config->set_listen_position (PreFaderListen);
-                       }
-               }
+       Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Solo"), X_("solo-use-pfl"));
+       if (ract->get_active()) {
+               Config->set_solo_control_is_listen_control (true);
+               Config->set_listen_position (PreFaderListen);
        }
 }
 
@@ -1083,7 +1028,7 @@ MonitorSection::update_solo_model ()
        }
 
        const char* action_name = 0;
-       Glib::RefPtr<Action> act;
+       Glib::RefPtr<RadioAction> ract;
 
        if (Config->get_solo_control_is_listen_control()) {
                switch (Config->get_listen_position()) {
@@ -1098,22 +1043,18 @@ MonitorSection::update_solo_model ()
                action_name = X_("solo-use-in-place");
        }
 
-       act = ActionManager::get_action (X_("Solo"), action_name);
-       if (act) {
+       ract = ActionManager::get_radio_action (X_("Solo"), action_name);
 
-               Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
-               if (ract) {
-                       /* because these are radio buttons, one of them will be
-                                active no matter what. to trigger a change in the
-                                action so that the view picks it up, toggle it.
-                                */
-                       if (ract->get_active()) {
-                               ract->set_active (false);
-                       }
-                       ract->set_active (true);
-               }
+       /* because these are radio buttons, one of them will be
+          active no matter what. to trigger a change in the
+          action so that the view picks it up, toggle it.
+       */
 
+       if (ract->get_active()) {
+               ract->set_active (false);
        }
+
+       ract->set_active (true);
 }
 
 void
@@ -1123,33 +1064,19 @@ MonitorSection::map_state ()
                return;
        }
 
-       Glib::RefPtr<Action> act;
-
        update_solo_model ();
 
-       act = ActionManager::get_action (X_("Monitor"), "monitor-cut-all");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-               if (tact) {
-                       tact->set_active (_monitor->cut_all());
-               }
-       }
+       Glib::RefPtr<Action> act;
+       Glib::RefPtr<ToggleAction> tact;
 
-       act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-               if (tact) {
-                       tact->set_active (_monitor->dim_all());
-               }
-       }
+       tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-cut-all");
+       tact->set_active (_monitor->cut_all());
 
-       act = ActionManager::get_action (X_("Monitor"), "monitor-mono");
-       if (act) {
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-               if (tact) {
-                       tact->set_active (_monitor->mono());
-               }
-       }
+       tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-dim-all");
+       tact->set_active (_monitor->dim_all());
+
+       tact = ActionManager::get_toggle_action (X_("Monitor"), "monitor-mono");
+       tact->set_active (_monitor->mono());
 
        uint32_t nchans = _monitor->output_streams().n_audio();
 
@@ -1160,46 +1087,30 @@ MonitorSection::map_state ()
                char action_name[32];
 
                snprintf (action_name, sizeof (action_name), "monitor-cut-%u", n);
-               act = ActionManager::get_action (X_("Monitor"), action_name);
-               if (act) {
-                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-                       if (tact) {
-                               tact->set_active (_monitor->cut (n));
-                       }
-               }
+               tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
+               tact->set_active (_monitor->cut (n));
 
                snprintf (action_name, sizeof (action_name), "monitor-dim-%u", n);
-               act = ActionManager::get_action (X_("Monitor"), action_name);
-               if (act) {
-                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-                       if (tact) {
-                               tact->set_active (_monitor->dimmed (n));
-                       }
-               }
+               tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
+               tact->set_active (_monitor->dimmed (n));
 
                snprintf (action_name, sizeof (action_name), "monitor-solo-%u", n);
-               act = ActionManager::get_action (X_("Monitor"), action_name);
-               if (act) {
-                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-                       if (tact) {
-                               tact->set_active (_monitor->soloed (n));
-                       }
-               }
+               tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
+               tact->set_active (_monitor->soloed (n));
 
                snprintf (action_name, sizeof (action_name), "monitor-invert-%u", n);
-               act = ActionManager::get_action (X_("Monitor"), action_name);
-               if (act) {
-                       Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
-                       if (tact) {
-                               tact->set_active (_monitor->inverted (n));
-                       }
-               }
+               tact = ActionManager::get_toggle_action (X_("Monitor"), action_name);
+               tact->set_active (_monitor->inverted (n));
        }
 }
 
 void
 MonitorSection::do_blink (bool onoff)
 {
+       if (!UIConfiguration::instance().get_blink_alert_indicators ()) {
+               onoff = true;
+       }
+
        solo_blink (onoff);
        audition_blink (onoff);
 }
@@ -1263,12 +1174,9 @@ MonitorSection::cancel_audition (GdkEventButton*)
 }
 
 #define SYNCHRONIZE_TOGGLE_ACTION(action, value) \
-       if (action) { \
-               Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(action); \
-               if (tact && tact->get_active() != value) { \
-                       tact->set_active(value); \
-               } \
-       }
+       if (action && action->get_active() != value) { \
+               action->set_active(value); \
+       } \
 
 void
 MonitorSection::parameter_changed (std::string name)
@@ -1278,13 +1186,11 @@ MonitorSection::parameter_changed (std::string name)
        } else if (name == "listen-position") {
                update_solo_model ();
        } else if (name == "solo-mute-override") {
-               SYNCHRONIZE_TOGGLE_ACTION(
-                               ActionManager::get_action (X_("Monitor"), "toggle-mute-overrides-solo"),
-                               Config->get_solo_mute_override ())
+               SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Solo"), "toggle-mute-overrides-solo"), Config->get_solo_mute_override ());
        } else if (name == "exclusive-solo") {
-               SYNCHRONIZE_TOGGLE_ACTION(
-                               ActionManager::get_action (X_("Monitor"), "toggle-exclusive-solo"),
-                               Config->get_exclusive_solo ())
+               SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Solo"), "toggle-exclusive-solo"), Config->get_exclusive_solo ());
+       } else if (name == "use-monitor-bus") {
+               SYNCHRONIZE_TOGGLE_ACTION (ActionManager::get_toggle_action (X_("Monitor"), "UseMonitorSection"), Config->get_use_monitor_bus ());
        }
 }
 
@@ -1670,7 +1576,7 @@ MonitorSection::port_connected_or_disconnected (boost::weak_ptr<Port> wa, boost:
 void
 MonitorSection::load_bindings ()
 {
-       bindings = Bindings::get_bindings (X_("Monitor Section"), myactions);
+       bindings = Bindings::get_bindings (X_("Monitor Section"));
 }
 
 void
@@ -1702,3 +1608,18 @@ MonitorSection::processors_changed (ARDOUR::RouteProcessorChange)
        update_processor_box ();
 }
 
+void
+MonitorSection::use_others_actions ()
+{
+       rude_solo_button.set_related_action (ActionManager::get_action (X_("Main"), X_("cancel-solo")));
+}
+
+void
+MonitorSection::toggle_use_monitor_section ()
+{
+       if (!_session) {
+               return;
+       }
+
+       Config->set_use_monitor_bus (ActionManager::get_toggle_action (X_("Monitor"), "UseMonitorSection")->get_active());
+}