X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_rtevents.cc;h=6328607eec7dcc6148c5920e84a29783da7fdb40;hb=1b24aad933a850f61d7442778134a001b2002ec2;hp=ff452137d9a8193b32c919af2e3c948875948d3b;hpb=c685724c8067fc9308c5f66f1b91d445509159e9;p=ardour.git

diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc
index ff452137d9..6328607eec 100644
--- 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)
+{
+	queue_event (get_rt_event (rl, mc, after, group_override, &Session::rt_set_monitoring));
+}
+
+void
+Session::rt_set_monitoring (boost::shared_ptr<RouteList> rl, MonitorChoice mc, 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 ();
+	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+		if (!(*i)->is_auditioner()) {
+			boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track> (*i);
+			if (t) {
+				t->set_monitoring (mc);
+			}
+		}
+	}
 
-	return ev;
+	set_dirty();
 }
 
 void
@@ -54,7 +63,7 @@ void
 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_hidden()) {
+		if (!(*i)->is_auditioner()) {
 			(*i)->set_solo (yn, this);
 		}
 	}
@@ -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, bool upstream, SessionEvent::RTeventCallback after)
+{
+	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));
+}
+
+void
+Session::rt_cancel_solo_after_disconnect (boost::shared_ptr<RouteList> rl, bool upstream, bool /* group_override */)
+{
+	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+		if (!(*i)->is_auditioner()) {
+			(*i)->cancel_solo_after_disconnect (upstream);
+		}
+	}
+	/* 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.
 	*/
@@ -83,13 +112,13 @@ Session::rt_set_just_one_solo (boost::shared_ptr<RouteList> just_one, bool yn, b
 	boost::shared_ptr<Route> r = just_one->front();
 
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-		if (!(*i)->is_hidden() && r != *i) {
+		if (!(*i)->is_auditioner() && r != *i) {
 			(*i)->set_solo (!yn, (*i)->route_group());
 		}
 	}
-	
+
 	r->set_solo (yn, r->route_group());
-	
+
 	set_dirty();
 }
 
@@ -103,7 +132,7 @@ void
 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_hidden()) {
+		if (!(*i)->is_auditioner()) {
 			(*i)->set_listen (yn, this);
 		}
 	}
@@ -121,11 +150,11 @@ void
 Session::rt_set_mute (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
 {
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-		if (!(*i)->is_hidden()) {
+		if (!(*i)->is_monitor() && !(*i)->is_auditioner()) {
 			(*i)->set_mute (yn, this);
 		}
 	}
-	
+
 	set_dirty();
 }
 
@@ -139,11 +168,11 @@ void
 Session::rt_set_solo_isolated (boost::shared_ptr<RouteList> rl, bool yn, bool /*group_override*/)
 {
 	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
-		if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_hidden()) {
+		if (!(*i)->is_master() && !(*i)->is_monitor() && !(*i)->is_auditioner()) {
 			(*i)->set_solo_isolated (yn, this);
 		}
 	}
-	
+
 	set_dirty();
 }
 
@@ -153,7 +182,26 @@ Session::set_record_enabled (boost::shared_ptr<RouteList> rl, bool yn, SessionEv
 	if (!writable()) {
 		return;
 	}
-	
+
+	/* do the non-RT part of rec-enabling first - the RT part will be done
+	 * on the next process cycle. This does mean that theoretically we are
+	 * doing things provisionally on the assumption that the rec-enable
+	 * change will work, but this had better be a solid assumption for
+	 * other reasons.
+	 */
+
+	for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) {
+		if ((*i)->is_auditioner()) {
+			continue;
+		}
+
+		boost::shared_ptr<Track> t;
+
+		if ((t = boost::dynamic_pointer_cast<Track>(*i)) != 0) {
+			t->prep_record_enabled (yn, (group_override ? (void*) t->route_group() : (void *) this));
+		}
+	}
+
 	queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_record_enabled));
 }
 
@@ -161,7 +209,7 @@ void
 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()) {
+		if ((*i)->is_auditioner()) {
 			continue;
 		}