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

Fix aux-send solo propagation

Browse source 
* Do not allow new send to change implicit solo (no propagation)
* Propagate changes to due aux-send removal upstream
  to tracks or busses connected to the source route.
* Forward solo-isolate
This commit is contained in:
Robin Gareus 2020-05-08 07:15:31 +02:00
parent caf057f06d
commit 21f2c01fcd
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 48 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/internal_send.h
View file

@ -84,7 +84,7 @@ private:
int use_target (boost::shared_ptr<Route>, bool update_name = true);
void target_io_changed ();
void propagate_solo (bool);
void propagate_solo ();
};
} // namespace ARDOUR

68
libs/ardour/internal_send.cc
View file

@ -34,6 +34,7 @@
#include "ardour/panner_shell.h"
#include "ardour/route.h"
#include "ardour/session.h"
#include "ardour/solo_isolate_control.h"
#include "pbd/i18n.h"
@ -73,36 +74,63 @@ InternalSend::InternalSend (Session& s,
InternalSend::~InternalSend ()
{
propagate_solo (false);
propagate_solo ();
if (_send_to) {
_send_to->remove_send_from_internal_return (this);
}
}
void
InternalSend::propagate_solo (bool enable)
InternalSend::propagate_solo ()
{
if (!_send_to || !_send_from) {
return;
}
bool from_soloed = _send_from->soloed();
bool to_soloed = _send_to->soloed();
if (enable) {
if (from_soloed) {
_send_to->solo_control()->mod_solo_by_others_upstream (1);
}
if (to_soloed) {
_send_from->solo_control()->mod_solo_by_others_downstream (1);
}
} else {
if (from_soloed && _send_to->solo_control()->soloed_by_others_upstream())
{
/* cache state before modification */
bool from_soloed = _send_from->soloed();
bool to_soloed = _send_to->soloed();
bool from_soloed_downstream = _send_from->solo_control()->soloed_by_others_downstream();
bool to_soloed_upstream = _send_to->solo_control()->soloed_by_others_upstream();
bool to_isolated_upstream = _send_to->solo_isolate_control()->solo_isolated_by_upstream();
if (from_soloed && (to_soloed_upstream | to_isolated_upstream)) {
if (to_soloed_upstream) {
_send_to->solo_control()->mod_solo_by_others_upstream (-1);
}
if (to_soloed && _send_from->solo_control()->soloed_by_others_downstream())
{
_send_from->solo_control()->mod_solo_by_others_downstream (-1);
if (to_isolated_upstream) {
_send_to->solo_isolate_control()->mod_solo_isolated_by_upstream (-1);
}
/* propagate further downstream alike Route::input_change_handler() */
boost::shared_ptr<RouteList> routes = _session.get_routes ();
for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
if ((*i) == _send_to || (*i)->is_master() || (*i)->is_monitor() || (*i)->is_auditioner()) {
continue;
}
bool sends_only;
bool does_feed = _send_to->feeds (*i, &sends_only);
if (does_feed && to_soloed_upstream) {
(*i)->solo_control()->mod_solo_by_others_upstream (-1);
}
if (does_feed && to_isolated_upstream) {
(*i)->solo_isolate_control()->mod_solo_isolated_by_upstream (-1);
}
}
}
if (to_soloed && from_soloed_downstream) {
_send_from->solo_control()->mod_solo_by_others_downstream (-1);
/* propagate further upstream alike Route::output_change_handler() */
boost::shared_ptr<RouteList> routes = _session.get_routes ();
for (RouteList::iterator i = routes->begin(); i != routes->end(); ++i) {
if (*i == _send_from || !(*i)->can_solo()) {
continue;
}
bool sends_only;
bool does_feed = (*i)->feeds (_send_from, &sends_only);
if (does_feed) {
(*i)->solo_control()->mod_solo_by_others_downstream (-1);
}
}
}
}
@ -123,7 +151,7 @@ int
InternalSend::use_target (boost::shared_ptr<Route> sendto, bool update_name)
{
if (_send_to) {
propagate_solo (false);
propagate_solo ();
_send_to->remove_send_from_internal_return (this);
}
@ -131,8 +159,6 @@ InternalSend::use_target (boost::shared_ptr<Route> sendto, bool update_name)
_send_to->add_send_to_internal_return (this);
propagate_solo (true);
mixbufs.ensure_buffers (_send_to->internal_return ()->input_streams (), _session.get_block_size ());
mixbufs.set_count (_send_to->internal_return ()->input_streams ());
@ -170,7 +196,7 @@ InternalSend::send_from_going_away ()
{
/* notify route while source-route is still available,
* signal emission in the d'tor is too late */
propagate_solo (false);
propagate_solo ();
_send_from.reset ();
}