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 --- libs/ardour/resampled_source.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libs/ardour/resampled_source.cc') diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc index 24eb12ad23..f3518537f6 100644 --- a/libs/ardour/resampled_source.cc +++ b/libs/ardour/resampled_source.cc @@ -32,7 +32,7 @@ const uint32_t ResampledImportableSource::blocksize = 524288U; const uint32_t ResampledImportableSource::blocksize = 16384U; #endif -ResampledImportableSource::ResampledImportableSource (boost::shared_ptr src, framecnt_t rate, SrcQuality srcq) +ResampledImportableSource::ResampledImportableSource (boost::shared_ptr src, samplecnt_t rate, SrcQuality srcq) : source (src) , _src_state (0) { @@ -69,8 +69,8 @@ ResampledImportableSource::~ResampledImportableSource () delete [] _input; } -framecnt_t -ResampledImportableSource::read (Sample* output, framecnt_t nframes) +samplecnt_t +ResampledImportableSource::read (Sample* output, samplecnt_t nframes) { int err; size_t bs = floor ((float)(blocksize / source->channels())) * source->channels(); @@ -120,7 +120,7 @@ ResampledImportableSource::read (Sample* output, framecnt_t nframes) } void -ResampledImportableSource::seek (framepos_t pos) +ResampledImportableSource::seek (samplepos_t pos) { source->seek (pos); @@ -143,7 +143,7 @@ ResampledImportableSource::seek (framepos_t pos) _end_of_input = false; } -framepos_t +samplepos_t ResampledImportableSource::natural_position () const { return source->natural_position() * ratio (); -- cgit v1.2.3