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 /gtk2_ardour/editor_export_audio.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 'gtk2_ardour/editor_export_audio.cc')
| -rw-r--r-- | gtk2_ardour/editor_export_audio.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 46a704b435..865796a1ed 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -162,7 +162,6 @@ Editor::write_region (string path, AudioRegion& region) jack_nframes_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - char workbuf[chunk_size *4]; jack_nframes_t pos; char s[PATH_MAX+1]; uint32_t cnt; @@ -234,11 +233,11 @@ Editor::write_region (string path, AudioRegion& region) fs = (*src); - if (region.read_at (buf, buf, gain_buffer, workbuf, pos, this_time) != this_time) { + if (region.read_at (buf, buf, gain_buffer, pos, this_time) != this_time) { break; } - if (fs->write (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { error << "" << endmsg; goto error_out; } @@ -309,7 +308,6 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi jack_nframes_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - char workbuf[chunk_size*4]; jack_nframes_t pos; char s[PATH_MAX+1]; uint32_t cnt; @@ -367,11 +365,11 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi fs = sources[n]; - if (playlist.read (buf, buf, gain_buffer, workbuf, pos, this_time, n) != this_time) { + if (playlist.read (buf, buf, gain_buffer, pos, this_time, n) != this_time) { break; } - if (fs->write (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { goto error_out; } } @@ -397,7 +395,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, list<Audi for (uint32_t n=0; n < channels; ++n) { fs = sources[n]; - if (fs->write (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { goto error_out; } } |