ardour/livetrax
13
0
Fork 0
Code

tentative fix for crash on roll

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@6101 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2009-11-16 23:21:53 +00:00
parent 95e4f7558b
commit 25ccf0f580
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/audio_track.cc
View File

@ -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();

1
libs/ardour/io.cc
View File

@ -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"

6
libs/ardour/route.cc
View File

@ -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;
}