ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

ensure that amp/fader is present on every route

Browse Source
This commit is contained in:
Robin Gareus 2016-05-26 15:42:33 +02:00
parent 00967a1982
commit 56471fd352
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/ardour/route.cc
View File

@ -172,14 +172,9 @@ Route::init ()
_output->changed.connect_same_thread (*this, boost::bind (&Route::output_change_handler, this, _1, _2));
_output->PortCountChanging.connect_same_thread (*this, boost::bind (&Route::output_port_count_changing, this, _1));
#if 0 // not used - just yet
if (!is_master() && !is_monitor() && !is_auditioner()) {
_delayline.reset (new DelayLine (_session, _name));
add_processor (_delayline, PreFader);
}
#endif
/* add amp processor */
/* add the amp/fader processor.
* it should be the first processor to be added on every route.
*/
_gain_control = boost::shared_ptr<GainControllable> (new GainControllable (_session, GainAutomation, shared_from_this ()));
add_control (_gain_control);
@ -191,6 +186,13 @@ Route::init ()
_amp->set_display_name (_("Monitor"));
}
#if 0 // not used - just yet
if (!is_master() && !is_monitor() && !is_auditioner()) {
_delayline.reset (new DelayLine (_session, _name));
add_processor (_delayline, PreFader);
}
#endif
/* and input trim */
_trim_control = boost::shared_ptr<GainControllable> (new GainControllable (_session, TrimAutomation, shared_from_this ()));
@ -5051,12 +5053,13 @@ Route::setup_invisible_processors ()
/* find the amp */
ProcessorList::iterator amp = new_processors.begin ();
while (amp != new_processors.end() && *amp != _amp) {
++amp;
}
ProcessorList::iterator amp = find (new_processors.begin(), new_processors.end(), _amp);
assert (amp != new_processors.end ());
if (amp == new_processors.end ()) {
error << string_compose (_("Amp/Fader on Route '%1' went AWOL. Re-added."), name()) << endmsg;
new_processors.push_front (_amp);
amp = find (new_processors.begin(), new_processors.end(), _amp);
}
/* and the processor after the amp */