Another stab at the logic for selecting regions for operations, to ensure that edit...

[ardour.git] / gtk2_ardour / monitor_section.cc

diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index f3a668804b51bd1b9f387382dc1c54e800f6bbc2..8173e8833dcc124fd6c7cb26148c1fd0ae9cc1ba 100644 (file)
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -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"
@@ -51,6 +52,7 @@ 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_mute_override_button (_("Solo/Mute"))
@@ -92,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 ();
 
@@ -100,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"));
 
@@ -182,7 +190,12 @@ MonitorSection::MonitorSection (Session* s)
         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 (*solo_opt_box, false, false);
@@ -306,12 +319,13 @@ MonitorSection::set_session (Session* s)
                         _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 */
@@ -458,12 +472,10 @@ MonitorSection::toggle_mute_overrides_solo ()
         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);
-                cerr << "Set solo_mute_override to " << tact->get_active() << endl;
                 Config->set_solo_mute_override (tact->get_active());
         }
 }
 
-
 void
 MonitorSection::dim_all ()
 {
@@ -727,27 +739,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
@@ -817,13 +836,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");
@@ -927,14 +941,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()) {
@@ -948,7 +968,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();