From 5d9c6089a41e5fa1c1cf72dc6d77b319fa0f6a92 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sat, 9 Apr 2011 15:00:15 +0000 Subject: [PATCH] formatting cleanup git-svn-id: svn://localhost/ardour2/branches/3.0@9335 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/audio_track.cc | 7 +++---- 1 file 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 apl = boost::dynamic_pointer_cast(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); }