ardour/livetrax
13
0
Fork 0
Code

formatting cleanup

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9335 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-04-09 15:00:15 +00:00
parent 64022eebcb
commit 5d9c6089a4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/audio_track.cc
View File

@ -529,15 +529,15 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
Glib::RWLock::ReaderLock rlock (_processor_lock); Glib::RWLock::ReaderLock rlock (_processor_lock);
boost::shared_ptr<AudioPlaylist> apl = boost::dynamic_pointer_cast<AudioPlaylist>(diskstream->playlist()); 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); 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) { if (apl->read (buffers.get_audio(0).data(), mix_buffer.get(), gain_buffer.get(), start, nframes) != nframes) {
return -1; return -1;
} }
assert(buffers.count().n_audio() >= 1);
uint32_t n=1; uint32_t n=1;
Sample* b = buffers.get_audio(0).data(); Sample* b = buffers.get_audio(0).data();
BufferSet::audio_iterator bi = buffers.audio_begin(); BufferSet::audio_iterator bi = buffers.audio_begin();
@ -548,8 +548,7 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
return -1; return -1;
} }
b = bi->data(); b = bi->data();
} } else {
else {
/* duplicate last across remaining buffers */ /* duplicate last across remaining buffers */
memcpy (bi->data(), b, sizeof (Sample) * nframes); memcpy (bi->data(), b, sizeof (Sample) * nframes);
} }