From 30c08ba655330232767554c48bda1975bfb5628c Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 Aug 2006 03:24:57 +0000 Subject: - Changed IO's vector's to PortList - Added new Port classes, code to drive them - Added PortList, which is a filthy mess ATM (nevermind that, it's the interface that's important at this stage) - Added ChanCount, though it isn't very thoroughly used yet. That's the next step.... - Fixed a few bugs relating to loading sessions saved with trunk - Fixed a few random other bugs Slowly working towards type agnosticism while keeping all the former code/logic intact is the name of the game here Warning: Removing ports is currently (intentionally) broken due solely to laziness. git-svn-id: svn://localhost/ardour2/branches/midi@786 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_export_audio.cc | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gtk2_ardour/editor_export_audio.cc') diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc index 7e26ba37b2..70c4863fd3 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -163,7 +163,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; @@ -235,11 +234,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; } @@ -310,7 +309,6 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, listwrite (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { goto error_out; } } @@ -398,7 +396,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, uint32_t channels, listwrite (buf, this_time, workbuf) != this_time) { + if (fs->write (buf, this_time) != this_time) { goto error_out; } } -- cgit v1.2.3