use volume controller widget for monitor section, drop some now-unused code
[ardour.git] / gtk2_ardour / monitor_section.cc
index 95b9e5c6a5b972f2a9a6f907949b82b06f7239c4..170f4568b4e3e465d6c19c45e142b6579a7b1b71 100644 (file)
@@ -6,6 +6,7 @@
 #include "gtkmm2ext/bindable_button.h"
 #include "gtkmm2ext/tearoff.h"
 #include "gtkmm2ext/actions.h"
+#include "gtkmm2ext/motionfeedback.h"
 
 #include "ardour/dB.h"
 #include "ardour/monitor_processor.h"
@@ -16,8 +17,8 @@
 #include "gui_thread.h"
 #include "monitor_section.h"
 #include "public_editor.h"
-#include "utils.h"
 #include "volume_controller.h"
+#include "utils.h"
 
 #include "i18n.h"
 
@@ -42,7 +43,7 @@ MonitorSection::MonitorSection (Session* s)
         , dim_control (0)
         , solo_boost_adjustment (1.0, 1.0, 3.0, 0.01, 0.1)  // upper and lower will be reset to match model
         , solo_boost_control (0)
-        , solo_cut_adjustment (0.0, 0.0, 1.0, 0.01, 0.1) // upper and lower will be reset to match model
+        , solo_cut_adjustment (0.0, 0.0, 1.0, 0.01, 0.1) 
         , solo_cut_control (0)
         , solo_in_place_button (solo_model_group, _("SiP"))
         , afl_button (solo_model_group, _("AFL"))
@@ -51,8 +52,10 @@ MonitorSection::MonitorSection (Session* s)
         , dim_all_button (_("dim"))
         , mono_button (_("mono"))
         , rude_solo_button (_("soloing"))
+        , rude_iso_button (_("isolated"))
         , rude_audition_button (_("auditioning"))
-        , exclusive_solo_button (_("Exclusive solo"))
+        , exclusive_solo_button (_("Exclusive"))
+        , solo_mute_override_button (_("Solo/Mute"))
 {
         Glib::RefPtr<Action> act;
 
@@ -71,7 +74,7 @@ MonitorSection::MonitorSection (Session* s)
 
         /* Dim */
 
-        dim_control = new VolumeController (little_knob_pixbuf, &dim_adjustment, false, 30, 30);
+        dim_control = new VolumeController (little_knob_pixbuf,  &dim_adjustment, false, 30, 30);
 
         HBox* dim_packer = manage (new HBox);
         dim_packer->show ();
@@ -91,6 +94,9 @@ MonitorSection::MonitorSection (Session* s)
        rude_solo_button.set_name ("TransportSoloAlert");
         rude_solo_button.show ();
 
+       rude_iso_button.set_name ("MonitorIsoAlert");
+        rude_iso_button.show ();
+
        rude_audition_button.set_name ("TransportAuditioningAlert");
         rude_audition_button.show ();
 
@@ -99,6 +105,9 @@ MonitorSection::MonitorSection (Session* s)
        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), 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), false);
         UI::instance()->set_tip (rude_audition_button, _("When active, auditioning is active.\nClick to stop the audition"));
 
@@ -127,7 +136,6 @@ MonitorSection::MonitorSection (Session* s)
                 act->connect_proxy (pfl_button);
         } 
 
-
         /* Solo Boost */
 
         solo_boost_control = new VolumeController (little_knob_pixbuf, &solo_boost_adjustment, false, 30, 30);
@@ -158,13 +166,39 @@ MonitorSection::MonitorSection (Session* s)
 
         solo_packer->pack_start (*spin_packer, true, true);
 
-        exclusive_solo_button.set_name (X_("MonitorCutButton"));
+        exclusive_solo_button.set_name (X_("MonitorOptButton"));
+        ARDOUR_UI::instance()->set_tip (&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"));
+        if (act) {
+                act->connect_proxy (exclusive_solo_button);
+        } 
+
+        solo_mute_override_button.set_name (X_("MonitorOptButton"));
+        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)"));
+        
+        act = ActionManager::get_action (X_("Monitor"), X_("toggle-mute-overrides-solo"));
+        if (act) {
+                act->connect_proxy (solo_mute_override_button);
+        } 
 
+        HBox* solo_opt_box = manage (new HBox);
+        solo_opt_box->set_spacing (12);
+        solo_opt_box->set_homogeneous (true);
+        solo_opt_box->pack_start (exclusive_solo_button);
+        solo_opt_box->pack_start (solo_mute_override_button);
+        solo_opt_box->show ();
+        
         upper_packer.set_spacing (12);
-        upper_packer.pack_start (rude_solo_button, false, false);
+
+        Gtk::HBox* rude_box = manage (new HBox);
+        rude_box->pack_start (rude_solo_button, true, true);
+        rude_box->pack_start (rude_iso_button, true, true);
+
+        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 (exclusive_solo_button, false, false);
+        upper_packer.pack_start (*solo_opt_box, false, false);
         upper_packer.pack_start (*solo_packer, false, false);
 
         act = ActionManager::get_action (X_("Monitor"), X_("monitor-cut-all"));
@@ -204,7 +238,7 @@ MonitorSection::MonitorSection (Session* s)
 
         /* Gain */
 
-        gain_control = new VolumeController (big_knob_pixbuf, &gain_adjustment, false, 80, 80);
+        gain_control = new VolumeController (big_knob_pixbuf,  &gain_adjustment, false, 80, 80);
 
         spin_label = manage (new Label (_("Gain")));
         spin_packer = manage (new VBox);
@@ -276,24 +310,26 @@ MonitorSection::set_session (Session* s)
                 _route = _session->monitor_out ();
 
                 if (_route) {
-                        /* session with control outs */
+                        /* session with monitor section */
                         _monitor = _route->monitor_control ();
                         assign_controllables ();
                 } else { 
-                        /* session with no control outs */
+                        /* session with no monitor section */
                         _monitor.reset ();
                         _route.reset ();
                 }
                 
-                        
         } else {
                 /* no session */
+
                 _monitor.reset ();
                 _route.reset ();
                 control_connections.drop_connections ();
-        }
+                rude_iso_button.set_active (false);
+                rude_solo_button.set_active (false);
 
-        /* both might be null */
+                assign_controllables ();
+        }
 }
 
 MonitorSection::ChannelButtonSet::ChannelButtonSet ()
@@ -411,6 +447,36 @@ MonitorSection::set_button_names ()
         solo_button_label.set_text ("rec");
 }
 
+void
+MonitorSection::toggle_exclusive_solo ()
+{
+        if (!_monitor) {
+                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());
+        }
+
+}
+
+
+void
+MonitorSection::toggle_mute_overrides_solo ()
+{
+        if (!_monitor) {
+                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());
+        }
+}
+
 void
 MonitorSection::dim_all ()
 {
@@ -537,6 +603,7 @@ MonitorSection::register_actions ()
 {
         string action_name;
         string action_descr;
+        Glib::RefPtr<Action> act;
 
         monitor_actions = ActionGroup::create (X_("Monitor"));
        ActionManager::add_action_group (monitor_actions);
@@ -550,6 +617,19 @@ MonitorSection::register_actions ()
         ActionManager::register_toggle_action (monitor_actions, "monitor-dim-all", "", 
                                                sigc::mem_fun (*this, &MonitorSection::dim_all));
 
+        act = ActionManager::register_toggle_action (monitor_actions, "toggle-exclusive-solo", "", 
+                                               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", "", 
+                                                     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) {
@@ -657,27 +737,34 @@ MonitorSection::setup_knob_images ()
 {
         try {
                 
-                big_knob_pixbuf = ::get_icon ("bigknob");
-                
+                big_knob_pixbuf = MotionFeedback::render_pixbuf (80);                
+
         }  catch (...) {
                 
-                error << "No knob image found (or not loadable) at "
-                      << " .... "
-                      << endmsg;
+                error << "No usable large knob image" << endmsg;
+                throw failed_constructor ();
+        }
+
+        if (!big_knob_pixbuf) {
+                error << "No usable large knob image" << endmsg;
                 throw failed_constructor ();
         }
         
         try {
-                
-                little_knob_pixbuf = ::get_icon ("littleknob");
+
+                little_knob_pixbuf = MotionFeedback::render_pixbuf (30);
                 
         }  catch (...) {
                 
-                error << "No knob image found (or not loadable) at "
-                      << " .... "
-                      << endmsg;
+                error << "No usable small knob image" << endmsg;
+                throw failed_constructor ();
+        }
+
+        if (!little_knob_pixbuf) {
+                error << "No usable small knob image" << endmsg;
                 throw failed_constructor ();
         }
+                
 }
 
 bool
@@ -747,13 +834,8 @@ MonitorSection::map_state ()
         if (act) {
                 Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
                 if (tact) {
-                        cerr << "Set monitor cut all action to " << _monitor->cut_all () << endl;
                         tact->set_active (_monitor->cut_all());
-                } else {
-                        cerr << " no global cut action\n";
                 }
-        } else {
-                cerr << " no global cut action2\n";
         }
 
         act = ActionManager::get_action (X_("Monitor"), "monitor-dim-all");
@@ -857,14 +939,20 @@ MonitorSection::solo_blink (bool onoff)
                } else {
                        rude_solo_button.set_state (STATE_NORMAL);
                }
+
+                if (_session->soloing()) {
+                        rude_iso_button.set_active (_session->solo_isolated());
+                }
+
        } else {
                // rude_solo_button.set_active (false);
                rude_solo_button.set_state (STATE_NORMAL);
+                rude_iso_button.set_active (false);
        }
 }
 
 bool
-MonitorSection::cancel_solo (GdkEventButton* ev)
+MonitorSection::cancel_solo (GdkEventButton*)
 {
         if (_session) {
                 if (_session->soloing()) {
@@ -878,7 +966,18 @@ MonitorSection::cancel_solo (GdkEventButton* ev)
 }
 
 bool
-MonitorSection::cancel_audition (GdkEventButton* ev)
+MonitorSection::cancel_isolate (GdkEventButton*)
+{
+        if (_session) {
+                boost::shared_ptr<RouteList> rl (_session->get_routes ());
+                _session->set_solo_isolated (rl, false, Session::rt_cleanup, true);
+        }
+
+        return true;
+}
+
+bool
+MonitorSection::cancel_audition (GdkEventButton*)
 {
        if (_session) {
                _session->cancel_audition();
@@ -913,9 +1012,16 @@ MonitorSection::assign_controllables ()
                 return;
         }
 
+        if (_session) {
+                boost::shared_ptr<Controllable> c = _session->solo_cut_control();
+                solo_cut_control->set_controllable (c);
+                solo_cut_control->get_adjustment()->set_value (c->get_value());
+        } else {
+                solo_cut_control->set_controllable (none);
+        }
+
         if (_route) {
                 gain_control->set_controllable (_route->gain_control());
-                control_link (control_connections, _route->gain_control(), gain_adjustment);
         } else {
                 gain_control->set_controllable (none);
         }
@@ -934,13 +1040,11 @@ MonitorSection::assign_controllables ()
                 dim_control->set_controllable (c);
                 dim_adjustment.set_lower (c->lower());
                 dim_adjustment.set_upper (c->upper());
-                control_link (control_connections, c, dim_adjustment);
                 
                 c = _monitor->solo_boost_control ();
                 solo_boost_control->set_controllable (c);
                 solo_boost_adjustment.set_lower (c->lower());
                 solo_boost_adjustment.set_upper (c->upper());
-                control_link (control_connections, c, solo_boost_adjustment);
 
         } else {