From 30b087ab3d28f1585987fa3f6ae006562ae192e3 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 18 Sep 2017 12:39:17 -0400 Subject: globally change all use of "frame" to refer to audio into "sample". Generated by tools/f2s. Some hand-editing will be required in a few places to fix up comments related to timecode and video in order to keep the legible --- 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 1a4f88e2f2..8159b784bc 100644 --- a/gtk2_ardour/editor_export_audio.cc +++ b/gtk2_ardour/editor_export_audio.cc @@ -213,11 +213,11 @@ bool Editor::write_region (string path, boost::shared_ptr region) { boost::shared_ptr fs; - const framepos_t chunk_size = 4096; - framepos_t to_read; + const samplepos_t chunk_size = 4096; + samplepos_t to_read; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - framepos_t pos; + samplepos_t pos; char s[PATH_MAX+1]; uint32_t cnt; vector > sources; @@ -266,7 +266,7 @@ Editor::write_region (string path, boost::shared_ptr region) fs = boost::dynamic_pointer_cast ( SourceFactory::createWritable (DataType::AUDIO, *_session, path, true, - false, _session->frame_rate())); + false, _session->sample_rate())); } catch (failed_constructor& err) { @@ -285,7 +285,7 @@ Editor::write_region (string path, boost::shared_ptr region) pos = region->position(); while (to_read) { - framepos_t this_time; + samplepos_t this_time; this_time = min (to_read, chunk_size); @@ -363,11 +363,11 @@ bool Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list& range) { boost::shared_ptr fs; - const framepos_t chunk_size = 4096; - framepos_t nframes; + const samplepos_t chunk_size = 4096; + samplepos_t nframes; Sample buf[chunk_size]; gain_t gain_buffer[chunk_size]; - framepos_t pos; + samplepos_t pos; char s[PATH_MAX+1]; uint32_t cnt; string path; @@ -405,7 +405,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list fs = boost::dynamic_pointer_cast ( SourceFactory::createWritable (DataType::AUDIO, *_session, path, true, - false, _session->frame_rate())); + false, _session->sample_rate())); } catch (failed_constructor& err) { @@ -423,7 +423,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list pos = (*i).start; while (nframes) { - framepos_t this_time; + samplepos_t this_time; this_time = min (nframes, chunk_size); @@ -455,7 +455,7 @@ Editor::write_audio_range (AudioPlaylist& playlist, const ChanCount& count, list while (nframes) { - framepos_t this_time = min (nframes, chunk_size); + samplepos_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