From fedf3d34f32264ac57c6a222b678dc90f2bb1a88 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 21 Oct 2006 19:01:50 +0000 Subject: Merged with trunk R992. Completely untested other than it compiles, runs, and records somewhat (need to merge again). git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_export_audio.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 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 1b0308b080..4526862f79 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -56,7 +56,7 @@ void Editor::export_session() { if (session) { - export_range (0, session->current_end_frame()); + export_range (session->current_start_frame(), session->current_end_frame()); } } @@ -75,7 +75,7 @@ Editor::export_selection () } void -Editor::export_range (jack_nframes_t start, jack_nframes_t end) +Editor::export_range (nframes_t start, nframes_t end) { if (session) { if (export_dialog == 0) { @@ -162,11 +162,11 @@ bool Editor::write_region (string path, boost::shared_ptr region) { boost::shared_ptr fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t to_read; + const nframes_t chunk_size = 4096; + nframes_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - jack_nframes_t pos; + nframes_t pos; char s[PATH_MAX+1]; uint32_t cnt; vector > sources; @@ -229,7 +229,7 @@ Editor::write_region (string path, boost::shared_ptr region) pos = region->position(); while (to_read) { - jack_nframes_t this_time; + nframes_t this_time; this_time = min (to_read, chunk_size); @@ -306,11 +306,11 @@ bool Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list& range) { boost::shared_ptr fs; - const jack_nframes_t chunk_size = 4096; - jack_nframes_t nframes; + const nframes_t chunk_size = 4096; + nframes_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - jack_nframes_t pos; + nframes_t pos; char s[PATH_MAX+1]; uint32_t cnt; string path; @@ -361,7 +361,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list pos = (*i).start; while (nframes) { - jack_nframes_t this_time; + nframes_t this_time; this_time = min (nframes, chunk_size); @@ -393,7 +393,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list while (nframes) { - jack_nframes_t this_time = min (nframes, chunk_size); + nframes_t this_time = min (nframes, chunk_size); memset (buf, 0, sizeof (Sample) * this_time); for (uint32_t n=0; n < channels; ++n) { -- cgit v1.2.3