summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorSakari Bergen <sakari.bergen@beatwaves.net>2012-06-24 13:38:42 +0000
committerSakari Bergen <sakari.bergen@beatwaves.net>2012-06-24 13:38:42 +0000
commit958fc23ed1d35318990b19685e715748181c06be (patch)
tree575e27b4b8b52ee6eae8e4566090efd670788adc /libs
parentff17d0c0a4ca645fb777b826ba78d82171ccfae7 (diff)
Fix stem export. The capturing processor of routes was never removed, and was restored inactive, which made stem export fail.
git-svn-id: svn://localhost/ardour2/branches/3.0@12916 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/route.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 0b4cc2ea06..83b1efce76 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1382,6 +1382,11 @@ Route::clear_processors (Placement p)
int
Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStreams* err, bool need_process_lock)
{
+ // TODO once the export point can be configured properly, do something smarter here
+ if (processor == _capturing_processor) {
+ _capturing_processor.reset();
+ }
+
/* these can never be removed */
if (processor == _amp || processor == _meter || processor == _main_outs) {
@@ -2454,7 +2459,8 @@ Route::set_processor_state (const XMLNode& node)
}
_monitor_control->set_state (**niter, Stateful::current_state_version);
} else if (prop->value() == "capture") {
- _capturing_processor.reset (new CapturingProcessor (_session));
+ /* CapturingProcessor should never be restored, it's always
+ added explicitly when needed */
} else {
ProcessorList::iterator o;