summaryrefslogtreecommitdiff
path: root/libs/ardour/resampled_source.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2017-09-18 12:39:17 -0400
commit30b087ab3d28f1585987fa3f6ae006562ae192e3 (patch)
tree620ae0250b5d77f90a18f8c2b83be61e4fe7b0b5 /libs/ardour/resampled_source.cc
parentcb956e3e480716a3efd280a5287bdd7bee1cedc5 (diff)
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
Diffstat (limited to 'libs/ardour/resampled_source.cc')
-rw-r--r--libs/ardour/resampled_source.cc10
1 files changed, 5 insertions, 5 deletions
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<ImportableSource> src, framecnt_t rate, SrcQuality srcq)
+ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> 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 ();