ardour/livetrax
13
0
Fork 0
Code

Fix duplicate Gain+Trim AutomationLists in session file.

Browse Source
This commit is contained in:
Robin Gareus 2017-06-21 12:18:57 +02:00
parent fd3bd35203
commit 31c6f66d9b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/ardour/route.cc
View File

@ -139,10 +139,12 @@ Route::init ()
/* add standard controls */ /* add standard controls */
_gain_control.reset (new GainControl (_session, GainAutomation)); _gain_control.reset (new GainControl (_session, GainAutomation));
add_control (_gain_control);
_trim_control.reset (new GainControl (_session, TrimAutomation)); _trim_control.reset (new GainControl (_session, TrimAutomation));
add_control (_trim_control); /* While the route has-a gain-control for consistency with Stripable and VCA
* ownership is handed over to the Amp Processor which manages the
* state of the Control and AutomationList as part of its
* Automatable API. -- Don't call add_control () here.
*/
_solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this)); _solo_control.reset (new SoloControl (_session, X_("solo"), *this, *this));
add_control (_solo_control); add_control (_solo_control);
@ -2539,9 +2541,7 @@ Route::set_state (const XMLNode& node, int version)
continue; continue;
} }
if (control_name == _gain_control->name()) { if (control_name == _solo_control->name()) {
_gain_control->set_state (*child, version);
} else if (control_name == _solo_control->name()) {
_solo_control->set_state (*child, version); _solo_control->set_state (*child, version);
} else if (control_name == _solo_safe_control->name()) { } else if (control_name == _solo_safe_control->name()) {
_solo_safe_control->set_state (*child, version); _solo_safe_control->set_state (*child, version);