X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_rtevents.cc;h=6328607eec7dcc6148c5920e84a29783da7fdb40;hb=d36b5c78bdb4cbb19d2817c86cd0e3c5cd899fe4;hp=945e4220760848a17d154e9ac013a82f0e6bc707;hpb=401c7091c805b24b926acb2b393070d3a32628a6;p=ardour.git diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc index 945e422076..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 rl, bool yn, SessionEvent::RTeventCallback after, bool group_override, - void (Session::*method) (boost::shared_ptr, bool, bool)) +void +Session::set_monitoring (boost::shared_ptr 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->ui = UICallback::get_ui_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 rl, MonitorChoice mc, bool /* group_override */) +{ + for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { + if (!(*i)->is_auditioner()) { + boost::shared_ptr t = boost::dynamic_pointer_cast (*i); + if (t) { + t->set_monitoring (mc); + } + } + } + + set_dirty(); } void @@ -51,10 +60,10 @@ Session::set_solo (boost::shared_ptr rl, bool yn, SessionEvent::RTeve } void -Session::rt_set_solo (boost::shared_ptr rl, bool yn, bool group_override) +Session::rt_set_solo (boost::shared_ptr 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 rl, bool yn, bool group_overr set_dirty(); } +void +Session::cancel_solo_after_disconnect (boost::shared_ptr r, bool upstream, SessionEvent::RTeventCallback after) +{ + boost::shared_ptr 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 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 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 just_one, bool yn, b boost::shared_ptr 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(); } @@ -100,10 +129,10 @@ Session::set_listen (boost::shared_ptr rl, bool yn, SessionEvent::RTe } void -Session::rt_set_listen (boost::shared_ptr rl, bool yn, bool group_override) +Session::rt_set_listen (boost::shared_ptr 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); } } @@ -118,39 +147,76 @@ Session::set_mute (boost::shared_ptr rl, bool yn, SessionEvent::RTeve } void -Session::rt_set_mute (boost::shared_ptr rl, bool yn, bool group_override) +Session::rt_set_mute (boost::shared_ptr 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(); } void -Session::set_record_enable (boost::shared_ptr rl, bool yn, SessionEvent::RTeventCallback after, bool group_override) +Session::set_solo_isolated (boost::shared_ptr rl, bool yn, SessionEvent::RTeventCallback after, bool group_override) +{ + queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_solo_isolated)); +} + +void +Session::rt_set_solo_isolated (boost::shared_ptr 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_auditioner()) { + (*i)->set_solo_isolated (yn, this); + } + } + + set_dirty(); +} + +void +Session::set_record_enabled (boost::shared_ptr 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)); + + /* 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 t; + + if ((t = boost::dynamic_pointer_cast(*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)); } void -Session::rt_set_record_enable (boost::shared_ptr rl, bool yn, bool group_override) +Session::rt_set_record_enabled (boost::shared_ptr 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; } boost::shared_ptr t; if ((t = boost::dynamic_pointer_cast(*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)); } } @@ -162,8 +228,8 @@ Session::process_rtop (SessionEvent* ev) { ev->rt_slot (); - if (ev->ui) { - ev->ui->call_slot (boost::bind (ev->rt_return, ev)); + if (ev->event_loop) { + ev->event_loop->call_slot (MISSING_INVALIDATOR, boost::bind (ev->rt_return, ev)); } else { warning << string_compose ("programming error: %1", X_("Session RT event queued from thread without a UI - cleanup in RT thread!")) << endmsg; ev->rt_return (ev);