summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2013-07-31 14:21:40 +0200
committerPaul Davis <paul@linuxaudiosystems.com>2013-08-08 15:26:18 -0400
commit9a8deb6ab4528ddd6400bf7b8192e55b694c13e1 (patch)
treeb3022f06623ddb0aa530a349f93f5024c6dba582 /libs
parent9ef2a89ccde5656849ea13429186b80e580b6ab8 (diff)
another amend to 00f26394a9
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/midi_track.cc2
-rw-r--r--libs/ardour/process_thread.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index c7768c7249..90b866ca92 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -353,7 +353,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame
return dret;
}
- BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers());
+ BufferSet& bufs = _session.get_route_buffers (n_process_buffers());
fill_buffers_with_input (bufs, _input, nframes);
diff --git a/libs/ardour/process_thread.cc b/libs/ardour/process_thread.cc
index 4c9789f37a..5d8d6f34fd 100644
--- a/libs/ardour/process_thread.cc
+++ b/libs/ardour/process_thread.cc
@@ -126,7 +126,7 @@ ProcessThread::get_route_buffers (ChanCount count, bool silence)
if (silence) {
for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
- for (size_t i= 0; i < count.get(*t); ++i) {
+ for (uint32_t i = 0; i < sb->count().get(*t); ++i) {
sb->get(*t, i).clear();
}
}