diff options
| author | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-07-20 13:50:25 +0200 |
|---|---|---|
| committer | Julien "_FrnchFrgg_" RIVAUD <frnchfrgg@free.fr> | 2016-07-20 13:58:42 +0200 |
| commit | 522b2885267589240a4c97fce5b997ea81ead264 (patch) | |
| tree | cf573ad51617ad1f7763841724217e4fb9aedcb6 | |
| parent | b648ad9cc7b1e5e4d888ac170950b0b0df25a22d (diff) | |
Make bus's trim control also affect sends to the bus
The trim processor was moved to the front after the internal return was,
so the trim setting was applied before the signal coming from other
tracks/busses sends was mixed in. Change the order so that trim applies
to audio from internal sends as well.
| -rw-r--r-- | libs/ardour/midi_region.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 15 |
2 files changed, 10 insertions, 7 deletions
diff --git a/libs/ardour/midi_region.cc b/libs/ardour/midi_region.cc index eef2811c5b..fed411b10a 100644 --- a/libs/ardour/midi_region.cc +++ b/libs/ardour/midi_region.cc @@ -142,7 +142,7 @@ MidiRegion::do_export (string path) const /* Lock our source since we'll be reading from it. write_to() will take a lock on newsrc. */ Source::Lock lm (midi_source(0)->mutex()); - if (midi_source(0)->export_write_to (lm, newsrc, bbegin, bend)) { + if (midi_source(0)->export _write_to (lm, newsrc, bbegin, bend)) { return false; } } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 8f32ca1aa3..f1bf1127c4 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -4510,10 +4510,17 @@ Route::setup_invisible_processors () new_processors.insert (amp, _monitor_control); } + /* TRIM CONTROL */ + + if (_trim && _trim->active()) { + assert (!_trim->display_to_user ()); + new_processors.push_front (_trim); + } + /* INTERNAL RETURN */ - /* doing this here means that any monitor control will come just after - the return. + /* doing this here means that any monitor control will come after + the return and trim. */ if (_intreturn) { @@ -4521,10 +4528,6 @@ Route::setup_invisible_processors () new_processors.push_front (_intreturn); } - if (_trim && _trim->active()) { - assert (!_trim->display_to_user ()); - new_processors.push_front (_trim); - } /* EXPORT PROCESSOR */ if (_capturing_processor) { |