implement solo group override

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

diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index 745212abb4151dee946ed9f1a8f5f2ea69879c09..2b24b59970175c4e581a3c38edf3ce85d1ae69ec 100644 (file)
--- a/libs/ardour/session_rtevents.cc
+++ b/libs/ardour/session_rtevents.cc
@@ -54,45 +54,43 @@ Session::rt_set_monitoring (boost::shared_ptr<RouteList> rl, MonitorChoice mc, b
 }
 
 void
-Session::set_solo (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override)
+Session::clear_all_solo_state (boost::shared_ptr<RouteList> rl)
 {
-       queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_solo));
+       queue_event (get_rt_event (rl, false, rt_cleanup, false, &Session::rt_clear_all_solo_state));
 }
 
 void
-Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool /* group_override */)
+Session::rt_clear_all_solo_state (boost::shared_ptr<RouteList> rl, bool /* yn */, bool /* group_override */)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-               if (!(*i)->is_auditioner()) {
-                       (*i)->set_solo (yn, this);
+               if ((*i)->is_auditioner()) {
+                       continue;
                }
+               (*i)->clear_all_solo_state();
        }
-
        set_dirty();
-       /* XXX boost::shared_ptr<RouteList>  goes out of scope here and is likley free()ed in RT context
-        * because boost's shared_ptr does reference counting and free/delete in the dtor.
-        * (this also applies to other rt_  methods here)
-        */
 }
 
 void
-Session::cancel_solo_after_disconnect (boost::shared_ptr<Route> r, bool upstream, SessionEvent::RTeventCallback after)
+Session::set_solo (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTeventCallback after, bool group_override)
 {
-       boost::shared_ptr<RouteList> rl (new RouteList);
-       rl->push_back (r);
-
-       queue_event (get_rt_event (rl, upstream, after, false, &Session::rt_cancel_solo_after_disconnect));
+       queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_solo));
 }
 
 void
-Session::rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList> rl, bool upstream, bool /* group_override */)
+Session::rt_set_solo (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                if (!(*i)->is_auditioner()) {
-                       (*i)->cancel_solo_after_disconnect (upstream);
+                       (*i)->set_solo (yn, this, group_override);
                }
        }
-       /* no need to call set-dirty - the disconnect will already have done that */
+
+       set_dirty();
+       /* XXX boost::shared_ptr<RouteList>  goes out of scope here and is likley free()ed in RT context
+        * because boost's shared_ptr does reference counting and free/delete in the dtor.
+        * (this also applies to other rt_  methods here)
+        */
 }
 
 void
@@ -133,11 +131,11 @@ Session::set_listen (boost::shared_ptr<RouteList> rl, bool yn, SessionEvent::RTe
 }
 
 void
-Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/ )
+Session::rt_set_listen (boost::shared_ptr<RouteList> rl, bool yn, bool group_override)
 {
        for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
                if (!(*i)->is_auditioner()) {
-                       (*i)->set_listen (yn, this);
+                       (*i)->set_listen (yn, this, group_override);
                }
        }