summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-04-09 15:00:15 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-04-09 15:00:15 +0000
commit5d9c6089a41e5fa1c1cf72dc6d77b319fa0f6a92 (patch)
treeb0e7c32efd553d91c5812a2874a4fb638b872759 /libs
parent64022eebcbb7b7720fa1920dd6bfbf3976c70b44 (diff)
formatting cleanup
git-svn-id: svn://localhost/ardour2/branches/3.0@9335 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r--libs/ardour/audio_track.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index efd6e8ba86..a1f309b390 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -529,15 +529,15 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
Glib::RWLock::ReaderLock rlock (_processor_lock);
boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist());
- assert(apl);
+ assert(apl);
+ assert(buffers.count().n_audio() >= 1);
assert ((framecnt_t) buffers.get_audio(0).capacity() >= nframes);
if (apl->read (buffers.get_audio(0).data(), mix_buffer.get(), gain_buffer.get(), start, nframes) != nframes) {
return -1;
}
- assert(buffers.count().n_audio() >= 1);
uint32_t n=1;
Sample* b = buffers.get_audio(0).data();
BufferSet::audio_iterator bi = buffers.audio_begin();
@@ -548,8 +548,7 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
return -1;
}
b = bi->data();
- }
- else {
+ } else {
/* duplicate last across remaining buffers */
memcpy (bi->data(), b, sizeof (Sample) * nframes);
}