diff options
author | David Robillard <d@drobilla.net> | 2006-08-10 03:04:13 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2006-08-10 03:04:13 +0000 |
commit | d4dd338beb813bcfe7470729cf6611aeea55cfa4 (patch) | |
tree | 7334c3f5811bcf1976c1687d346d64603232732b /libs/ardour/audio_track.cc | |
parent | ae95684d225bb5725211656859e3d801045e05f3 (diff) |
- Fixed a buffer size bug when ~/.ardour2 doesn't exist (can't load configuration), if in a hacky way
- Removed useless workbuf/conversion_buffers (same thing), uneeded with libsndfile
git-svn-id: svn://localhost/ardour2/trunk@781 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
-rw-r--r-- | libs/ardour/audio_track.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 78af23e3df..2f33012546 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -627,7 +627,7 @@ AudioTrack::silent_roll (jack_nframes_t nframes, jack_nframes_t start_frame, jac } int -AudioTrack::export_stuff (vector<Sample*>& buffers, char * workbuf, uint32_t nbufs, jack_nframes_t start, jack_nframes_t nframes) +AudioTrack::export_stuff (vector<Sample*>& buffers, uint32_t nbufs, jack_nframes_t start, jack_nframes_t nframes) { gain_t gain_automation[nframes]; gain_t gain_buffer[nframes]; @@ -645,7 +645,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, char * workbuf, uint32_t nbu AudioPlaylist* const apl = dynamic_cast<AudioPlaylist*>(diskstream.playlist()); assert(apl); - if (apl->read (buffers[0], mix_buffer, gain_buffer, workbuf, start, nframes) != nframes) { + if (apl->read (buffers[0], mix_buffer, gain_buffer, start, nframes) != nframes) { return -1; } @@ -655,7 +655,7 @@ AudioTrack::export_stuff (vector<Sample*>& buffers, char * workbuf, uint32_t nbu ++bi; for (; bi != buffers.end(); ++bi, ++n) { if (n < diskstream.n_channels()) { - if (apl->read ((*bi), mix_buffer, gain_buffer, workbuf, start, nframes, n) != nframes) { + if (apl->read ((*bi), mix_buffer, gain_buffer, start, nframes, n) != nframes) { return -1; } b = (*bi); |