smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Prepare for foldback bus A/PF Listen

Browse source
This commit is contained in:
Robin Gareus 2021-03-24 17:47:53 +01:00
parent aab296be48
commit c1f1cd5b3e
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
6 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/ardour/route.h
View file

@ -184,6 +184,9 @@ public:
bool is_safe () const { bool is_safe () const {
return _solo_safe_control->get_value(); return _solo_safe_control->get_value();
} }
bool can_monitor () const {
return can_solo() || is_foldbackbus ();
}
void enable_monitor_send (); void enable_monitor_send ();
void set_denormal_protection (bool yn); void set_denormal_protection (bool yn);

1
libs/ardour/ardour/soloable.h
View file

@ -31,6 +31,7 @@ class Soloable {
virtual void push_solo_isolate_upstream (int32_t delta) = 0; virtual void push_solo_isolate_upstream (int32_t delta) = 0;
virtual bool is_safe () const = 0; virtual bool is_safe () const = 0;
virtual bool can_solo () const = 0; virtual bool can_solo () const = 0;
virtual bool can_monitor () const = 0;
}; };
} /* namespace */ } /* namespace */

1
libs/ardour/ardour/vca.h
View file

@ -79,6 +79,7 @@ class LIBARDOUR_API VCA : public Stripable,
void push_solo_upstream (int32_t) {} void push_solo_upstream (int32_t) {}
void push_solo_isolate_upstream (int32_t) {} void push_solo_isolate_upstream (int32_t) {}
bool can_solo() const { return true; } bool can_solo() const { return true; }
bool can_monitor() const { return false; }
bool is_safe () const { return false; } bool is_safe () const { return false; }
/* Muteable API */ /* Muteable API */

1
libs/ardour/route.cc
View file

@ -3349,7 +3349,6 @@ Route::enable_monitor_send ()
/* master never sends to monitor section via the normal mechanism */ /* master never sends to monitor section via the normal mechanism */
assert (!is_master ()); assert (!is_master ());
assert (!is_monitor ()); assert (!is_monitor ());
assert (!is_foldbackbus ());
/* make sure we have one */ /* make sure we have one */
if (!_monitor_send) { if (!_monitor_send) {

30
libs/ardour/session.cc
View file

@ -1155,7 +1155,7 @@ Session::setup_route_monitor_sends (bool enable, bool need_process_lock)
ProcessorChangeBlocker pcb (this, false /* XXX */); ProcessorChangeBlocker pcb (this, false /* XXX */);
for (RouteList::iterator x = rls->begin(); x != rls->end(); ++x) { for (RouteList::iterator x = rls->begin(); x != rls->end(); ++x) {
if ((*x)->can_solo ()) { if ((*x)->can_monitor ()) {
if (enable) { if (enable) {
(*x)->enable_monitor_send (); (*x)->enable_monitor_send ();
} else { } else {
@ -3093,7 +3093,7 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i
/* set/unset monitor-send */ /* set/unset monitor-send */
Glib::Threads::Mutex::Lock lm (_engine.process_lock()); Glib::Threads::Mutex::Lock lm (_engine.process_lock());
for (RouteList::iterator x = ret.begin(); x != ret.end(); ++x) { for (RouteList::iterator x = ret.begin(); x != ret.end(); ++x) {
if ((*x)->can_solo ()) { if ((*x)->can_monitor ()) {
if (_monitor_out) { if (_monitor_out) {
(*x)->enable_monitor_send (); (*x)->enable_monitor_send ();
} else { } else {
@ -3258,7 +3258,7 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool
Glib::Threads::Mutex::Lock lm (_engine.process_lock()); Glib::Threads::Mutex::Lock lm (_engine.process_lock());
for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) { for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
if ((*x)->can_solo ()) { if ((*x)->can_monitor ()) {
(*x)->enable_monitor_send (); (*x)->enable_monitor_send ();
} }
} }
@ -3454,7 +3454,7 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
} }
/* if the monitoring section had a pointer to this route, remove it */ /* if the monitoring section had a pointer to this route, remove it */
if (!deletion_in_progress () && _monitor_out && (*iter)->can_solo ()) { if (!deletion_in_progress () && _monitor_out && (*iter)->can_monitor ()) {
Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ());
ProcessorChangeBlocker pcb (this, false); ProcessorChangeBlocker pcb (this, false);
(*iter)->remove_monitor_send (); (*iter)->remove_monitor_send ();
@ -3571,7 +3571,7 @@ Session::route_listen_changed (Controllable::GroupControlDisposition group_overr
continue; continue;
} }
if ((*i)->solo_isolate_control()->solo_isolated() || !(*i)->can_solo()) { if ((*i)->solo_isolate_control()->solo_isolated() || !(*i)->can_monitor()) {
/* route does not get solo propagated to it */ /* route does not get solo propagated to it */
continue; continue;
} }
@ -3801,17 +3801,15 @@ Session::update_route_solo_state (boost::shared_ptr<RouteList> r)
} }
for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
if ((*i)->can_solo()) { if ((*i)->can_monitor() && Config->get_solo_control_is_listen_control()) {
if (Config->get_solo_control_is_listen_control()) { if ((*i)->solo_control()->soloed_by_self_or_masters()) {
if ((*i)->solo_control()->soloed_by_self_or_masters()) { listeners++;
listeners++; something_listening = true;
something_listening = true; }
} } else if ((*i)->can_solo()) {
} else { (*i)->set_listen (false);
(*i)->set_listen (false); if ((*i)->can_solo() && (*i)->solo_control()->soloed_by_self_or_masters()) {
if ((*i)->can_solo() && (*i)->solo_control()->soloed_by_self_or_masters()) { something_soloed = true;
something_soloed = true;
}
} }
} }

12
libs/ardour/solo_control.cc
View file

@ -79,7 +79,7 @@ SoloControl::set_mute_master_solo ()
void void
SoloControl::mod_solo_by_others_downstream (int32_t delta) SoloControl::mod_solo_by_others_downstream (int32_t delta)
{ {
if (_soloable.is_safe() || !_soloable.can_solo()) { if (_soloable.is_safe() || !can_solo()) {
return; return;
} }
@ -106,7 +106,7 @@ SoloControl::mod_solo_by_others_downstream (int32_t delta)
void void
SoloControl::mod_solo_by_others_upstream (int32_t delta) SoloControl::mod_solo_by_others_upstream (int32_t delta)
{ {
if (_soloable.is_safe() || !_soloable.can_solo()) { if (_soloable.is_safe() || !can_solo()) {
return; return;
} }
@ -161,7 +161,7 @@ SoloControl::mod_solo_by_others_upstream (int32_t delta)
void void
SoloControl::actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override) SoloControl::actually_set_value (double val, PBD::Controllable::GroupControlDisposition group_override)
{ {
if (_soloable.is_safe() || !_soloable.can_solo()) { if (_soloable.is_safe() || !can_solo()) {
return; return;
} }
@ -351,5 +351,9 @@ SoloControl::pre_remove_master (boost::shared_ptr<AutomationControl> m)
bool bool
SoloControl::can_solo () const SoloControl::can_solo () const
{ {
return _soloable.can_solo (); if (Config->get_solo_control_is_listen_control()) {
return _soloable.can_monitor ();
} else {
return _soloable.can_solo ();
}
} }