diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-16 23:21:53 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-16 23:21:53 +0000 |
| commit | 25ccf0f5807cc48c8c5d35f1a352e66397ade7bc (patch) | |
| tree | 3b8896dc5f75abb086da827e865e7f39caa207fa | |
| parent | 95e4f7558b6d9616ef2180682a8c203c2226261b (diff) | |
tentative fix for crash on roll
git-svn-id: svn://localhost/ardour2/branches/3.0@6101 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/audio_track.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/io.cc | 1 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 2c38e37dee..e2101479fe 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -523,7 +523,7 @@ AudioTrack::roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, /* copy the diskstream data to all output buffers */ - size_t limit = n_process_buffers().n_audio(); + size_t limit = _input->n_ports().n_audio(); BufferSet& bufs = _session.get_scratch_buffers (); const size_t blimit = bufs.count().n_audio(); diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index a56f817814..7c92ab87cd 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -41,7 +41,6 @@ #include "ardour/midi_port.h" #include "ardour/session.h" #include "ardour/cycle_timer.h" -#include "ardour/panner.h" #include "ardour/buffer_set.h" #include "ardour/meter.h" #include "ardour/amp.h" diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 053b565128..e129a22d2c 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1376,6 +1376,7 @@ Route::configure_processors_unlocked (ProcessorStreams* err) _in_configure_processors = true; + // Check each processor in order to see if we can configure as requested ChanCount in = _input->n_ports (); ChanCount out; @@ -1406,11 +1407,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err) out = c->second; } - // Ensure route outputs match last processor's outputs - if (out != _output->n_ports ()) { - _output->ensure_io (out, false, this); - } - _in_configure_processors = false; return 0; } |