fix track-header vertical scrolling
[ardour.git] / gtk2_ardour / monitor_section.cc
index ccd63201c2e4018fdc77f3c48c8bcedac2fb30f7..6d2fdbb677981e5d0f4a93a1247ae65f67529ccd 100644 (file)
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <gdkmm/pixbuf.h>
 
 #include "pbd/compose.h"
 #include "gtkmm2ext/actions.h"
 #include "gtkmm2ext/motionfeedback.h"
 
-#include "ardour/dB.h"
+#include <gtkmm/menu.h>
+#include <gtkmm/menuitem.h>
+
 #include "ardour/monitor_processor.h"
 #include "ardour/route.h"
-#include "ardour/utils.h"
 
 #include "ardour_ui.h"
 #include "gui_thread.h"
@@ -23,6 +43,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
 using namespace Gtk;
 using namespace Gtkmm2ext;
 using namespace PBD;
@@ -36,19 +57,26 @@ MonitorSection::MonitorSection (Session* s)
         : AxisView (s)
         , RouteUI (s)
         , _tearoff (0)
+       , channel_table_viewport (*channel_table_scroller.get_hadjustment(),
+                                 *channel_table_scroller.get_vadjustment ())
         , gain_control (0)
         , dim_control (0)
         , solo_boost_control (0)
         , solo_cut_control (0)
-        , solo_in_place_button (solo_model_group, _("SiP"))
-        , afl_button (solo_model_group, _("AFL"))
-        , pfl_button (solo_model_group, _("PFL"))
-       , cut_all_button (ArdourButton::led_default_elements)
-       , dim_all_button (ArdourButton::led_default_elements)
-       , mono_button (ArdourButton::led_default_elements)
+        , gain_display (0)
+        , dim_display (0)
+        , solo_boost_display (0)
+        , solo_cut_display (0)
+        , solo_in_place_button (_("SiP"), ArdourButton::led_default_elements)
+        , afl_button (_("AFL"), ArdourButton::led_default_elements)
+       , pfl_button (_("PFL"), ArdourButton::led_default_elements)
        , exclusive_solo_button (ArdourButton::led_default_elements)
        , solo_mute_override_button (ArdourButton::led_default_elements)
+       , _inhibit_solo_model_update (false)
 {
+
+       using namespace Menu_Helpers;
+
         Glib::RefPtr<Action> act;
 
         if (!monitor_actions) {
@@ -64,52 +92,39 @@ MonitorSection::MonitorSection (Session* s)
         VBox* spin_packer;
         Label* spin_label;
 
-        /* Dim */
-
-        dim_control = new VolumeController (little_knob_pixbuf, boost::shared_ptr<Controllable>(), 0.0, 0.01, 0.1, true, 30, 30, true);
-
-        HBox* dim_packer = manage (new HBox);
-        dim_packer->show ();
-
-        spin_label = manage (new Label (_("Dim")));
-        spin_packer = manage (new VBox);
-        spin_packer->show ();
-        spin_packer->set_spacing (6);
-        spin_packer->pack_start (*dim_control, false, false);
-        spin_packer->pack_start (*spin_label, false, false);
-
-        dim_packer->set_spacing (12);
-        dim_packer->pack_start (*spin_packer, true, false);
-
         /* Rude Solo */
 
-       rude_solo_button.set_text (_("soloing"));
+       rude_solo_button.set_text (_("Soloing"));
        rude_solo_button.set_name ("rude solo");
         rude_solo_button.show ();
 
-       rude_iso_button.set_text (_("isolated"));
+       rude_iso_button.set_text (_("Isolated"));
        rude_iso_button.set_name ("rude isolate");
         rude_iso_button.show ();
 
-       rude_audition_button.set_text (_("auditioning"));
+       rude_audition_button.set_text (_("Auditioning"));
        rude_audition_button.set_name ("rude audition");
         rude_audition_button.show ();
 
         ARDOUR_UI::Blink.connect (sigc::mem_fun (*this, &MonitorSection::do_blink));
 
-       rude_solo_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_solo));
+       rude_solo_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_solo), false);
         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));
+       rude_iso_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_isolate), false);
         UI::instance()->set_tip (rude_iso_button, _("When active, something is solo-isolated.\nClick to de-isolate everything"));
 
-       rude_audition_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_audition));
+       rude_audition_button.signal_button_press_event().connect (sigc::mem_fun(*this, &MonitorSection::cancel_audition), false);
         UI::instance()->set_tip (rude_audition_button, _("When active, auditioning is active.\nClick to stop the audition"));
 
+       solo_in_place_button.set_name ("monitor section solo model");
+       afl_button.set_name ("monitor section solo model");
+       pfl_button.set_name ("monitor section solo model");
+
         solo_model_box.set_spacing (6);
-        solo_model_box.pack_start (solo_in_place_button, false, false);
-        solo_model_box.pack_start (afl_button, false, false);
-        solo_model_box.pack_start (pfl_button, false, false);
+        solo_model_box.pack_start (solo_in_place_button, true, false);
+        solo_model_box.pack_start (afl_button, true, false);
+        solo_model_box.pack_start (pfl_button, true, false);
 
         solo_in_place_button.show ();
         afl_button.show ();
@@ -117,51 +132,108 @@ MonitorSection::MonitorSection (Session* s)
         solo_model_box.show ();
 
         act = ActionManager::get_action (X_("Solo"), X_("solo-use-in-place"));
+       ARDOUR_UI::instance()->tooltips().set_tip (solo_in_place_button, _("Solo controls affect solo-in-place"));
         if (act) {
-                act->connect_proxy (solo_in_place_button);
+               solo_in_place_button.set_related_action (act);
         }
 
         act = ActionManager::get_action (X_("Solo"), X_("solo-use-afl"));
+       ARDOUR_UI::instance()->tooltips().set_tip (afl_button, _("Solo controls toggle after-fader-listen"));
         if (act) {
-                act->connect_proxy (afl_button);
+               afl_button.set_related_action (act);
         }
 
         act = ActionManager::get_action (X_("Solo"), X_("solo-use-pfl"));
+       ARDOUR_UI::instance()->tooltips().set_tip (pfl_button, _("Solo controls toggle pre-fader-listen"));
         if (act) {
-                act->connect_proxy (pfl_button);
+               pfl_button.set_related_action (act);
         }
 
         /* Solo Boost */
 
-        solo_boost_control = new VolumeController (little_knob_pixbuf, boost::shared_ptr<Controllable>(), 0.0, 0.01, 0.1, true, 30, 30, true);
-
+        solo_boost_control = new ArdourKnob ();
+               solo_boost_control->set_name("monitor knob");
+               solo_boost_control->set_size_request(40,40);
+               ARDOUR_UI::instance()->tooltips().set_tip (*solo_boost_control, _("Gain increase for soloed signals (0dB is normal)"));
+
+        solo_boost_display = new ArdourDisplay ();
+               solo_boost_display->set_name("monitor section cut");
+               solo_boost_display->set_size_request(80,20);
+               solo_boost_display->add_controllable_preset("0dB", 0.0);
+               solo_boost_display->add_controllable_preset("3 dB", 3.0);
+               solo_boost_display->add_controllable_preset("6 dB", 6.0);
+               solo_boost_display->add_controllable_preset("10 dB", 10.0);
+        
         HBox* solo_packer = manage (new HBox);
-        solo_packer->set_spacing (12);
+        solo_packer->set_spacing (6);
         solo_packer->show ();
 
         spin_label = manage (new Label (_("Solo Boost")));
         spin_packer = manage (new VBox);
         spin_packer->show ();
-        spin_packer->set_spacing (6);
-        spin_packer->pack_start (*solo_boost_control, false, false);
+        spin_packer->set_spacing (3);
         spin_packer->pack_start (*spin_label, false, false);
+        spin_packer->pack_start (*solo_boost_control, false, false);
+        spin_packer->pack_start (*solo_boost_display, false, false);
 
-        solo_packer->pack_start (*spin_packer, false, true);
+        solo_packer->pack_start (*spin_packer, true, false);
 
         /* Solo (SiP) cut */
 
-        solo_cut_control = new VolumeController (little_knob_pixbuf, boost::shared_ptr<Controllable>(), 0.0, 0.1, 0.5, true, 30, 30, true);
-
+        solo_cut_control = new ArdourKnob ();
+        solo_cut_control->set_name ("monitor knob");
+        solo_cut_control->set_size_request (40,40);
+               ARDOUR_UI::instance()->tooltips().set_tip (*solo_cut_control, _("Gain reduction non-soloed signals\nA value above -inf dB causes \"solo-in-front\""));
+
+        solo_cut_display = new ArdourDisplay ();
+               solo_cut_display->set_name("monitor section cut");
+               solo_cut_display->set_size_request(80,20);
+               solo_cut_display->add_controllable_preset("0dB", 0.0);
+               solo_cut_display->add_controllable_preset("-6 dB", -6.0);
+               solo_cut_display->add_controllable_preset("-12 dB", -12.0);
+               solo_cut_display->add_controllable_preset("-20 dB", -20.0);
+               solo_cut_display->add_controllable_preset("OFF", -1200.0);
+       
         spin_label = manage (new Label (_("SiP Cut")));
         spin_packer = manage (new VBox);
         spin_packer->show ();
-        spin_packer->set_spacing (6);
+        spin_packer->set_spacing (3);
+        spin_packer->pack_start (*spin_label, false, false);
         spin_packer->pack_start (*solo_cut_control, false, false);
+        spin_packer->pack_start (*solo_cut_display, false, false);
+
+        solo_packer->pack_start (*spin_packer, true, false);
+
+        /* Dim */
+
+        dim_control = new ArdourKnob ();
+        dim_control->set_name ("monitor knob");
+        dim_control->set_size_request (40,40);
+               ARDOUR_UI::instance()->tooltips().set_tip (*dim_control, _("Gain reduction to use when dimming monitor outputs"));
+
+        dim_display = new ArdourDisplay ();
+               dim_display->set_name("monitor section cut");
+               dim_display->set_size_request(80,20);
+               dim_display->add_controllable_preset("0dB", 0.0);
+               dim_display->add_controllable_preset("-3 dB", -3.0);
+               dim_display->add_controllable_preset("-6 dB", -6.0);
+               dim_display->add_controllable_preset("-12 dB", -12.0);
+               dim_display->add_controllable_preset("-20 dB", -20.0);
+        
+        HBox* dim_packer = manage (new HBox);
+        dim_packer->show ();
+
+        spin_label = manage (new Label (_("Dim")));
+        spin_packer = manage (new VBox);
+        spin_packer->show ();
+        spin_packer->set_spacing (3);
         spin_packer->pack_start (*spin_label, false, false);
+        spin_packer->pack_start (*dim_control, false, false);
+        spin_packer->pack_start (*dim_display, false, false);
 
-        solo_packer->pack_start (*spin_packer, false, true);
+        dim_packer->pack_start (*spin_packer, true, false);
 
-       exclusive_solo_button.set_text (_("excl. solo"));
+               exclusive_solo_button.set_text (_("Excl. Solo"));
         exclusive_solo_button.set_name (X_("monitor solo exclusive"));
         ARDOUR_UI::instance()->set_tip (&exclusive_solo_button, _("Exclusive solo means that only 1 solo is active at a time"));
 
@@ -170,7 +242,7 @@ MonitorSection::MonitorSection (Session* s)
                exclusive_solo_button.set_related_action (act);
         }
 
-       solo_mute_override_button.set_text (_("solo » mute"));
+       solo_mute_override_button.set_text (_("Solo » Mute"));
         solo_mute_override_button.set_name (X_("monitor solo override"));
         ARDOUR_UI::instance()->set_tip (&solo_mute_override_button, _("If enabled, solo will override mute\n(a soloed & muted track or bus will be audible)"));
 
@@ -186,7 +258,7 @@ MonitorSection::MonitorSection (Session* s)
         solo_opt_box->pack_start (solo_mute_override_button);
         solo_opt_box->show ();
 
-        upper_packer.set_spacing (12);
+        upper_packer.set_spacing (6);
 
         Gtk::HBox* rude_box = manage (new HBox);
         rude_box->pack_start (rude_solo_button, true, true);
@@ -194,11 +266,11 @@ MonitorSection::MonitorSection (Session* s)
 
         upper_packer.pack_start (*rude_box, false, false);
         upper_packer.pack_start (rude_audition_button, false, false);
-        upper_packer.pack_start (solo_model_box, false, false);
+        upper_packer.pack_start (solo_model_box, false, false, 12);
         upper_packer.pack_start (*solo_opt_box, false, false);
-        upper_packer.pack_start (*solo_packer, false, false);
+        upper_packer.pack_start (*solo_packer, false, false, 12);
 
-        cut_all_button.set_text (_("mute"));
+        cut_all_button.set_text (_("Mute"));
        cut_all_button.set_name ("monitor section cut");
         cut_all_button.set_name (X_("monitor section cut"));
         cut_all_button.set_size_request (-1,50);
@@ -207,16 +279,16 @@ MonitorSection::MonitorSection (Session* s)
         act = ActionManager::get_action (X_("Monitor"), X_("monitor-cut-all"));
         if (act) {
                cut_all_button.set_related_action (act);
-        }
+       }
 
-       dim_all_button.set_text (_("dim"));
+       dim_all_button.set_text (_("Dim"));
        dim_all_button.set_name ("monitor section dim");
         act = ActionManager::get_action (X_("Monitor"), X_("monitor-dim-all"));
         if (act) {
                dim_all_button.set_related_action (act);
         }
 
-       mono_button.set_text (_("mono"));
+       mono_button.set_text (_("Mono"));
        mono_button.set_name ("monitor section mono");
         act = ActionManager::get_action (X_("Monitor"), X_("monitor-mono"));
         if (act) {
@@ -235,14 +307,27 @@ MonitorSection::MonitorSection (Session* s)
 
         /* Gain */
 
-        gain_control = new VolumeController (big_knob_pixbuf, boost::shared_ptr<Controllable>(), 1.0, 0.01, 0.1, true, 80, 80, false);
-
-        spin_label = manage (new Label (_("Monitor")));
-       spin_packer = manage (new VBox);
+        gain_control = new ArdourKnob ();
+               gain_control->set_name("monitor knob");
+               gain_control->set_size_request(80,80);
+        
+        gain_display = new ArdourDisplay ();
+               gain_display->set_name("monitor section cut");
+               gain_display->set_size_request(40,20);
+               gain_display->add_controllable_preset("0dB", 0.0);
+               gain_display->add_controllable_preset("-3 dB", -3.0);
+               gain_display->add_controllable_preset("-6 dB", -6.0);
+               gain_display->add_controllable_preset("-12 dB", -12.0);
+               gain_display->add_controllable_preset("-20 dB", -20.0);
+               gain_display->add_controllable_preset("-30 dB", -30.0);
+        
+               spin_label = manage (new Label (_("Monitor")));
+               spin_packer = manage (new VBox);
         spin_packer->show ();
-        spin_packer->set_spacing (6);
-        spin_packer->pack_start (*gain_control, false, false);
+        spin_packer->set_spacing (3);
         spin_packer->pack_start (*spin_label, false, false);
+        spin_packer->pack_start (*gain_control, false, false);
+        spin_packer->pack_start (*gain_display, false, false);
 
         lower_packer.pack_start (*spin_packer, true, true);
 
@@ -250,22 +335,34 @@ MonitorSection::MonitorSection (Session* s)
        channel_table_scroller.set_size_request (-1, 150);
        channel_table_scroller.set_shadow_type (Gtk::SHADOW_NONE);
        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_("out")));
-        channel_table_header.attach (*l1, 0, 1, 0, 1, EXPAND|FILL);
-        l1 = manage (new Label (X_("cut")));
-        channel_table_header.attach (*l1, 1, 2, 0, 1, EXPAND|FILL);
-        l1 = manage (new Label (X_("dim")));
-        channel_table_header.attach (*l1, 2, 3, 0, 1, EXPAND|FILL);
-        l1 = manage (new Label (X_("solo")));
-        channel_table_header.attach (*l1, 3, 4, 0, 1, EXPAND|FILL);
-        l1 = manage (new Label (X_("inv")));
-        channel_table_header.attach (*l1, 4, 5, 0, 1, EXPAND|FILL);
+
+       Label* l1 = manage (new Label (X_("  ")));
+       l1->set_name (X_("MonitorSectionLabel"));
+       channel_table_header.attach (*l1, 0, 1, 0, 1, EXPAND|FILL);
+
+       l1 = manage (new Label (X_("Mute")));
+       l1->set_name (X_("MonitorSectionLabel"));
+       channel_table_header.attach (*l1, 1, 2, 0, 1, EXPAND|FILL);
+
+       l1 = manage (new Label (X_("Dim")));
+       l1->set_name (X_("MonitorSectionLabel"));
+       channel_table_header.attach (*l1, 2, 3, 0, 1, EXPAND|FILL);
+
+       l1 = manage (new Label (X_("Solo")));
+       l1->set_name (X_("MonitorSectionLabel"));
+       channel_table_header.attach (*l1, 3, 4, 0, 1, EXPAND|FILL);
+
+       l1 = manage (new Label (X_("Inv")));
+       l1->set_name (X_("MonitorSectionLabel"));
+       channel_table_header.attach (*l1, 4, 5, 0, 1, EXPAND|FILL);
+
        channel_table_header.show ();
 
        table_hpacker.pack_start (channel_table, true, true);
@@ -273,7 +370,7 @@ MonitorSection::MonitorSection (Session* s)
        /* note that we don't pack the table_hpacker till later
         */
 
-        vpacker.set_border_width (12);
+        vpacker.set_border_width (6);
         vpacker.set_spacing (12);
         vpacker.pack_start (upper_packer, false, false);
         vpacker.pack_start (*dim_packer, false, false);
@@ -284,8 +381,11 @@ MonitorSection::MonitorSection (Session* s)
         hpacker.pack_start (vpacker, true, true);
 
         gain_control->show_all ();
+        gain_display->show_all ();
         dim_control->show_all ();
+        dim_display->show_all();
         solo_boost_control->show_all ();
+        solo_boost_display->show_all();
 
         channel_table.show ();
         hpacker.show ();
@@ -306,7 +406,7 @@ MonitorSection::MonitorSection (Session* s)
 
         /* catch changes that affect us */
 
-        Config->ParameterChanged.connect (config_connection, invalidator (*this), ui_bind (&MonitorSection::parameter_changed, this, _1), gui_context());
+        Config->ParameterChanged.connect (config_connection, invalidator (*this), boost::bind (&MonitorSection::parameter_changed, this, _1), gui_context());
 }
 
 MonitorSection::~MonitorSection ()
@@ -318,8 +418,13 @@ MonitorSection::~MonitorSection ()
         _channel_buttons.clear ();
 
         delete gain_control;
+        delete gain_display;
         delete dim_control;
+        delete dim_display;
         delete solo_boost_control;
+        delete solo_boost_display;
+        delete solo_cut_control;
+        delete solo_cut_display;
         delete _tearoff;
 }
 
@@ -345,23 +450,24 @@ MonitorSection::set_session (Session* s)
                if (channel_table_scroller.get_parent()) {
                        /* scroller is packed, so remove it */
                        channel_table_packer.remove (channel_table_scroller);
-                       /* remove the table_hpacker from the scroller */
-                       channel_table_scroller.remove ();
                } 
 
-               if (table_hpacker.get_parent ()) {
+               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 (_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_scroller.add (table_hpacker);
+                       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 {
@@ -390,28 +496,19 @@ MonitorSection::set_session (Session* s)
 }
 
 MonitorSection::ChannelButtonSet::ChannelButtonSet ()
-       : cut (ArdourButton::just_led_default_elements)
-       , dim (ArdourButton::just_led_default_elements)
-       , solo (ArdourButton::just_led_default_elements)
-       , invert (ArdourButton::just_led_default_elements)
 {
-       cut.set_diameter (3);
-       dim.set_diameter (3);
-       solo.set_diameter (3);
-       invert.set_diameter (3);
-
-        cut.set_name (X_("monitor section cut"));
-        dim.set_name (X_("monitor section dim"));
-        solo.set_name (X_("monitor section solo"));
-        invert.set_name (X_("monitor section invert"));
-
-        cut.unset_flags (Gtk::CAN_FOCUS);
-        dim.unset_flags (Gtk::CAN_FOCUS);
-        solo.unset_flags (Gtk::CAN_FOCUS);
-        invert.unset_flags (Gtk::CAN_FOCUS);
+       cut.set_name (X_("monitor section cut"));
+       dim.set_name (X_("monitor section dim"));
+       solo.set_name (X_("monitor section solo"));
+       invert.set_name (X_("monitor section invert"));
+
+       cut.unset_flags (Gtk::CAN_FOCUS);
+       dim.unset_flags (Gtk::CAN_FOCUS);
+       solo.unset_flags (Gtk::CAN_FOCUS);
+       invert.unset_flags (Gtk::CAN_FOCUS);
 }
 
-void
+       void
 MonitorSection::populate_buttons ()
 {
         if (!_monitor) {
@@ -485,14 +582,6 @@ MonitorSection::populate_buttons ()
         channel_table.show_all ();
 }
 
-void
-MonitorSection::set_button_names ()
-{
-        rec_enable_button_label.set_text ("rec");
-        mute_button_label.set_text ("rec");
-        solo_button_label.set_text ("rec");
-}
-
 void
 MonitorSection::toggle_exclusive_solo ()
 {
@@ -549,7 +638,7 @@ MonitorSection::cut_all ()
         if (act) {
                Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
                 _monitor->set_cut_all (tact->get_active());
-        }
+       }
 }
 
 void
@@ -654,22 +743,22 @@ MonitorSection::register_actions ()
         monitor_actions = ActionGroup::create (X_("Monitor"));
        ActionManager::add_action_group (monitor_actions);
 
-        ActionManager::register_toggle_action (monitor_actions, "monitor-mono", "", "Switch monitor to mono",
+        ActionManager::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",
+        ActionManager::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",
+        ActionManager::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 = ActionManager::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 = ActionManager::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);
@@ -686,17 +775,17 @@ MonitorSection::register_actions ()
                                                        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+1);
+                action_descr = string_compose (_("Dim monitor channel %1"), 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+1);
+                action_descr = string_compose (_("Solo monitor channel %1"), 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+1);
+                action_descr = string_compose (_("Invert monitor channel %1"), 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));
 
@@ -706,11 +795,11 @@ MonitorSection::register_actions ()
         Glib::RefPtr<ActionGroup> solo_actions = ActionGroup::create (X_("Solo"));
         RadioAction::Group solo_group;
 
-        ActionManager::register_radio_action (solo_actions, solo_group, "solo-use-in-place", "", "In-place solo",
+        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",
+        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",
+        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::add_action_group (solo_actions);
@@ -729,7 +818,16 @@ MonitorSection::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;
                 }
         }
 }
@@ -747,8 +845,8 @@ MonitorSection::solo_use_afl ()
                 Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (act);
                 if (ract) {
                         if (ract->get_active()) {
-                                Config->set_listen_position (AfterFaderListen);
                                 Config->set_solo_control_is_listen_control (true);
+                                Config->set_listen_position (AfterFaderListen);
                         }
                 }
         }
@@ -762,13 +860,13 @@ MonitorSection::solo_use_pfl ()
           active.
        */
 
-        Glib::RefPtr<Action> act = ActionManager::get_action (X_("Solo"), X_("solo-use-afl"));
+        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_listen_position (PreFaderListen);
                                 Config->set_solo_control_is_listen_control (true);
+                                Config->set_listen_position (PreFaderListen);
                         }
                 }
         }
@@ -816,6 +914,10 @@ MonitorSection::setup_knob_images ()
 void
 MonitorSection::update_solo_model ()
 {
+       if (_inhibit_solo_model_update) {
+               return;
+       }
+       
         const char* action_name = 0;
         Glib::RefPtr<Action> act;
 
@@ -834,10 +936,19 @@ MonitorSection::update_solo_model ()
 
         act = ActionManager::get_action (X_("Solo"), action_name);
         if (act) {
+
                 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);
                 }
+               
         }
 }
 
@@ -884,7 +995,7 @@ MonitorSection::map_state ()
 
                 char action_name[32];
 
-                snprintf (action_name, sizeof (action_name), "monitor-cut-%u", n+1);
+                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);
@@ -893,7 +1004,7 @@ MonitorSection::map_state ()
                         }
                 }
 
-                snprintf (action_name, sizeof (action_name), "monitor-dim-%u", n+1);
+                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);
@@ -902,7 +1013,7 @@ MonitorSection::map_state ()
                         }
                 }
 
-                snprintf (action_name, sizeof (action_name), "monitor-solo-%u", n+1);
+                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);
@@ -911,7 +1022,7 @@ MonitorSection::map_state ()
                         }
                 }
 
-                snprintf (action_name, sizeof (action_name), "monitor-invert-%u", n+1);
+                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);
@@ -937,13 +1048,9 @@ MonitorSection::audition_blink (bool onoff)
        }
 
        if (_session->is_auditioning()) {
-               if (onoff) {
-                       rude_audition_button.set_active_state (Gtkmm2ext::Active);
-               } else {
-                       rude_audition_button.unset_active_state ();
-               }
+               rude_audition_button.set_active (onoff);
        } else {
-               rude_audition_button.unset_active_state ();
+               rude_audition_button.set_active (false);
        }
 }
 
@@ -955,22 +1062,17 @@ MonitorSection::solo_blink (bool onoff)
        }
 
        if (_session->soloing() || _session->listening()) {
-               if (onoff) {
-                       rude_solo_button.set_active_state (Gtkmm2ext::Active);
-               } else {
-                       rude_solo_button.unset_active_state ();
-               }
+               rude_solo_button.set_active (onoff);
 
                 if (_session->soloing()) {
                        if (_session->solo_isolated()) {
-                               rude_iso_button.set_active_state (Gtkmm2ext::Active);
+                               rude_iso_button.set_active (false);
                        }
-                }
+               }
 
        } else {
-               // rude_solo_button.set_active (false);
-               rude_solo_button.unset_active_state ();
-                rude_iso_button.unset_active_state ();
+               rude_solo_button.set_active (false);
+                rude_iso_button.set_active (false);
        }
 }
 
@@ -1011,8 +1113,9 @@ MonitorSection::cancel_audition (GdkEventButton*)
 void
 MonitorSection::parameter_changed (std::string name)
 {
-        if (name == "solo-control-is-listen-control" ||
-            name == "listen-position") {
+        if (name == "solo-control-is-listen-control") {
+                update_solo_model ();
+       } else if (name == "listen-position") {
                 update_solo_model ();
         }
 }
@@ -1028,13 +1131,16 @@ MonitorSection::assign_controllables ()
         }
 
         if (_session) {
-               solo_cut_control->set_controllable (_session->solo_cut_control());
+                       solo_cut_control->set_controllable (_session->solo_cut_control());
+                       solo_cut_display->set_controllable (_session->solo_cut_control());
         } else {
-                solo_cut_control->set_controllable (none);
+            solo_cut_control->set_controllable (none);
+                       solo_cut_display->set_controllable (none);
         }
 
         if (_route) {
                 gain_control->set_controllable (_route->gain_control());
+                gain_display->set_controllable (_route->gain_control());
         } else {
                 gain_control->set_controllable (none);
         }
@@ -1048,8 +1154,10 @@ MonitorSection::assign_controllables ()
                 mono_button.set_controllable (_monitor->mono_control());
                 mono_button.watch ();
 
-               dim_control->set_controllable (_monitor->dim_level_control ());
-               solo_boost_control->set_controllable (_monitor->solo_boost_control ());
+                               dim_control->set_controllable (_monitor->dim_level_control ());
+                               dim_display->set_controllable (_monitor->dim_level_control ());
+                               solo_boost_control->set_controllable (_monitor->solo_boost_control ());
+                               solo_boost_display->set_controllable (_monitor->solo_boost_control ());
 
         } else {
 
@@ -1058,7 +1166,9 @@ MonitorSection::assign_controllables ()
                 mono_button.set_controllable (none);
 
                 dim_control->set_controllable (none);
+                dim_display->set_controllable (none);
                 solo_boost_control->set_controllable (none);
+                solo_boost_display->set_controllable (none);
         }
 }