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

Consolidate check for internal/non-removable processors

This commit is contained in:
Robin Gareus 2017-09-23 00:18:18 +02:00
parent ab3889fff8
commit 13cf4da011
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/route.h
View File

@ -703,6 +703,8 @@ public:
boost::shared_ptr<PeakMeter> _meter;
boost::shared_ptr<DelayLine> _delayline;
bool is_internal_processor (boost::shared_ptr<Processor>) const;
boost::shared_ptr<Processor> the_instrument_unlocked() const;
SlavableControlList slavables () const;

19
libs/ardour/route.cc
View File

@ -1251,7 +1251,7 @@ Route::clear_processors (Placement p)
seen_amp = true;
}
if ((*i) == _amp || (*i) == _meter || (*i) == _main_outs || (*i) == _delayline || (*i) == _trim) {
if (is_internal_processor (*i)) {
/* you can't remove these */
@ -1301,6 +1301,15 @@ Route::clear_processors (Placement p)
}
}
bool
Route::is_internal_processor (boost::shared_ptr<Processor> p) const
{
if (p == _amp || p == _meter || p == _main_outs || p == _delayline || p == _trim) {
return true;
}
return false;
}
int
Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStreams* err, bool need_process_lock)
{
@ -1320,7 +1329,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream
/* these can never be removed */
if (processor == _amp || processor == _meter || processor == _main_outs || processor == _delayline || processor == _trim) {
if (is_internal_processor (processor)) {
return 0;
}
@ -1422,11 +1431,11 @@ int
Route::replace_processor (boost::shared_ptr<Processor> old, boost::shared_ptr<Processor> sub, ProcessorStreams* err)
{
/* these can never be removed */
if (old == _amp || old == _meter || old == _main_outs || old == _delayline || old == _trim) {
if (is_internal_processor (old)) {
return 1;
}
/* and can't be used as substitute, either */
if (sub == _amp || sub == _meter || sub == _main_outs || sub == _delayline || sub == _trim) {
if (is_internal_processor (sub)) {
return 1;
}
@ -1541,7 +1550,7 @@ Route::remove_processors (const ProcessorList& to_be_deleted, ProcessorStreams*
/* these can never be removed */
if (processor == _amp || processor == _meter || processor == _main_outs || processor == _delayline || processor == _trim) {
if (is_internal_processor (processor)) {
++i;
continue;
}