ardour/livetrax
13
0
Fork 0
Code

Fix monitor-sends with templates

Browse Source 
This fixes an issues with missing monitor-sends when creating
a session from a template with monitor-section, or when creating
tracks from a route-template.
This commit is contained in:
Robin Gareus 2020-11-27 00:11:41 +01:00
parent a62fd0379e
commit b043336c86
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libs/ardour/session.cc
View File

@ -398,6 +398,7 @@ Session::Session (AudioEngine &eng,
}
}
/* apply the loaded state_tree */
int err = post_engine_init ();
if (err) {
@ -422,6 +423,22 @@ Session::Session (AudioEngine &eng,
}
}
if (!mix_template.empty()) {
/* fixup monitor-sends */
if (Config->get_use_monitor_bus ()) {
/* Session::config_changed will have set use-monitor-bus to match the template.
* search for want_ms, have_ms
*/
assert (_monitor_out);
/* ..but sends do not exist, since templated track bitslots are unset */
setup_route_monitor_sends (true, true);
} else {
/* remove any monitor-sends that may be in the template */
assert (!_monitor_out);
setup_route_monitor_sends (false, true);
}
}
if (!unnamed) {
store_recent_sessions (_name, _path);
}
@ -3057,6 +3074,21 @@ Session::new_route_from_template (uint32_t how_many, PresentationInfo::order_t i
IO::enable_connecting ();
if (!ret.empty()) {
/* set/unset monitor-send */
Glib::Threads::Mutex::Lock lm (_engine.process_lock());
for (RouteList::iterator x = ret.begin(); x != ret.end(); ++x) {
if ((*x)->can_solo ()) {
if (_monitor_out) {
(*x)->enable_monitor_send ();
} else {
/* this may happen with old templates */
(*x)->remove_monitor_send ();
}
}
}
}
return ret;
}