fix #4405, by explicitly cancelling solo when a route's inputs drop to zero

[ardour.git] / libs / ardour / session_rtevents.cc

diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index 921a6348ebdd87cfc7fd507cf2700ceaf4203e56..43d291c45870b239d51e513a2f43e71eb14a41b1 100644 (file)
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -32,16 +32,25 @@ using namespace PBD;
 using namespace ARDOUR;
 using namespace Glib;
 
-SessionEvent*
-Session::get_rt_event (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override,  
-                      void (Session::*method) (boost::shared_ptr<RouteList>, bool, bool))
+void
+Session::set_monitoring (boost::shared_ptr<RouteList> rl, MonitorChoice mc, SessionEvent::RTeventCallback after, bool group_override)
 {
-       SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0);
-       ev->rt_slot = boost::bind (method, this, rl, yn, group_override);
-       ev->rt_return = after;
-       ev->event_loop = EventLoop::get_event_loop_for_thread ();
+       queue_event (get_rt_event (rl, mc, after, group_override, &Session::rt_set_monitoring));
+}
 
-       return ev;
+void
+Session::rt_set_monitoring (boost::shared_ptr<RouteList> rl, MonitorChoice mc, bool /* group_override */)
+{
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               if (!(*i)->is_hidden()) {
+                       boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
+                       if (t) {
+                               t->set_monitoring (mc);
+                       }
+               }
+       }
+
+       set_dirty();
 }
 
 void
@@ -62,10 +71,30 @@ Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool /* group_ov
        set_dirty();
 }
 
+void
+Session::cancel_solo_after_disconnect (boost::shared_ptr<Route> r, SessionEvent::RTeventCallback after)
+{
+       boost::shared_ptr<RouteList> rl (new RouteList);
+       rl->push_back (r);
+
+       queue_event (get_rt_event (rl, false, after, false, &Session::rt_cancel_solo_after_disconnect));
+}
+
+void
+Session::rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList> rl, bool /*yn */, bool /* group_override */)
+{
+       for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+               if (!(*i)->is_hidden()) {
+                       (*i)->cancel_solo_after_disconnect ();
+               }
+       }
+       /* no need to call set-dirty - the disconnect will already have done that */
+}
+
 void
 Session::set_just_one_solo (boost::shared_ptr<Route> r, bool yn, SessionEvent::RTeventCallback after)
 {
-       /* its a bit silly to have to do this, but it keeps the API for this public method sane (we're 
+       /* its a bit silly to have to do this, but it keeps the API for this public method sane (we're
           only going to solo one route) and keeps our ability to use get_rt_event() for the internal
           private method.
        */
@@ -87,9 +116,9 @@ Session::rt_set_just_one_solo (boost::shared_ptr<RouteList> just_one, bool yn, b
                        (*i)->set_solo (!yn, (*i)->route_group());
                }
        }
-       
+
        r->set_solo (yn, r->route_group());
-       
+
        set_dirty();
 }
 
@@ -125,7 +154,7 @@ Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_ove
                        (*i)->set_mute (yn, this);
                }
        }
-       
+
        set_dirty();
 }
 
@@ -143,22 +172,22 @@ Session::rt_set_solo_isolated (boost::shared_ptr<RouteList> rl, bool yn, bool /*
                        (*i)->set_solo_isolated (yn, this);
                }
        }
-       
+
        set_dirty();
 }
 
 void
-Session::set_record_enable (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override)
+Session::set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override)
 {
        if (!writable()) {
                return;
        }
-       
-       queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_record_enable));
+
+       queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_record_enabled));
 }
 
 void
-Session::rt_set_record_enable (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
+Session::rt_set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                if ((*i)->is_hidden()) {
@@ -168,7 +197,7 @@ Session::rt_set_record_enable (boost::shared_ptr<RouteList> rl, bool yn, bool gr
                boost::shared_ptr<Track> t;
 
                if ((t = boost::dynamic_pointer_cast<Track>(*i)) != 0) {
-                       t->set_record_enable (yn, (group_override ? (void*) t->route_group() : (void *) this));
+                       t->set_record_enabled (yn, (group_override ? (void*) t->route_group() : (void *) this));
                }
        }