summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/ardour/midi_region.cc2
-rw-r--r--libs/ardour/route.cc15
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) {