X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fsession_rtevents.cc;h=8dba60f0e5cbe0017d423d80c2bad63d96a29b09;hb=e845b9f9357c4ff471c02b1f63a61275bb4a7d28;hp=5def97941f7eefa856f86fbd4cb403368d3364b0;hpb=f450df300c9c057141a4caf79ff6dbfbf58492d9;p=ardour.git diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc index 5def97941f..8dba60f0e5 100644 --- a/libs/ardour/session_rtevents.cc +++ b/libs/ardour/session_rtevents.cc @@ -21,9 +21,11 @@ #include "pbd/error.h" #include "pbd/compose.h" -#include "ardour/session.h" +#include "ardour/monitor_control.h" #include "ardour/route.h" +#include "ardour/session.h" #include "ardour/track.h" +#include "ardour/vca_manager.h" #include "i18n.h" @@ -32,138 +34,63 @@ 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)) -{ - 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 (); - - return ev; -} - void -Session::set_solo (boost::shared_ptr rl, bool yn, SessionEvent::RTeventCallback after, bool group_override) +Session::set_controls (boost::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) { - queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_solo)); -} + std::cerr << "Session::set_controls called on " << cl->size() << " controls, group = " << enum_2_string (gcd) << std::endl; -void -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()) { - (*i)->set_solo (yn, this); - } + for (ControlList::iterator ci = cl->begin(); ci != cl->end(); ++ci) { + /* as of july 2017 this is a no-op for everything except record enable */ + (*ci)->do_pre_realtime_queue_stuff (val); } - set_dirty(); + queue_event (get_rt_event (cl, val, gcd)); } void -Session::set_just_one_solo (boost::shared_ptr r, bool yn, SessionEvent::RTeventCallback after) +Session::set_control (boost::shared_ptr ac, double val, Controllable::GroupControlDisposition gcd) { - /* 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. - */ - - boost::shared_ptr rl (new RouteList); - rl->push_back (r); - - queue_event (get_rt_event (rl, yn, after, false, &Session::rt_set_just_one_solo)); + boost::shared_ptr cl (new ControlList); + cl->push_back (ac); + set_controls (cl, val, gcd); } void -Session::rt_set_just_one_solo (boost::shared_ptr just_one, bool yn, bool /*ignored*/) +Session::rt_set_controls (boost::shared_ptr cl, double val, Controllable::GroupControlDisposition gcd) { - boost::shared_ptr rl = routes.reader (); - boost::shared_ptr r = just_one->front(); - - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - if (!(*i)->is_hidden() && r != *i) { - (*i)->set_solo (!yn, (*i)->route_group()); - } + for (ControlList::iterator c = cl->begin(); c != cl->end(); ++c) { + (*c)->set_value (val, gcd); } - - r->set_solo (yn, r->route_group()); - - set_dirty(); } void -Session::set_listen (boost::shared_ptr rl, bool yn, SessionEvent::RTeventCallback after, bool group_override) +Session::clear_all_solo_state (boost::shared_ptr rl) { - queue_event (get_rt_event (rl, yn, after, group_override, &Session::rt_set_listen)); + queue_event (get_rt_event (rl, false, rt_cleanup, Controllable::NoGroup, &Session::rt_clear_all_solo_state)); } void -Session::rt_set_listen (boost::shared_ptr rl, bool yn, bool /*group_override*/ ) +Session::rt_clear_all_solo_state (boost::shared_ptr rl, bool /* yn */, Controllable::GroupControlDisposition /* group_override */) { for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - if (!(*i)->is_hidden()) { - (*i)->set_listen (yn, this); + if ((*i)->is_auditioner()) { + continue; } + (*i)->clear_all_solo_state(); } - set_dirty(); -} + _vca_manager->clear_all_solo_state (); -void -Session::set_mute (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_mute)); -} - -void -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()) { - (*i)->set_mute (yn, this); - } - } - set_dirty(); } -void -Session::set_record_enable (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)); -} - -void -Session::rt_set_record_enable (boost::shared_ptr rl, bool yn, bool group_override) -{ - for (RouteList::iterator i = rl->begin(); i != rl->end(); ++i) { - if ((*i)->is_hidden()) { - 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)); - } - } - - set_dirty (); -} - void Session::process_rtop (SessionEvent* ev) { ev->rt_slot (); if (ev->event_loop) { - ev->event_loop->call_slot (boost::bind (ev->rt_return, ev)); + 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);