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/caimportable.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libs/ardour/caimportable.cc') diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc index b9bd20ddc3..13721f8334 100644 --- a/libs/ardour/caimportable.cc +++ b/libs/ardour/caimportable.cc @@ -55,12 +55,12 @@ CAImportableSource::~CAImportableSource () { } -framecnt_t -CAImportableSource::read (Sample* buffer, framecnt_t nframes) +samplecnt_t +CAImportableSource::read (Sample* buffer, samplecnt_t nframes) { - framecnt_t nread = 0; + samplecnt_t nread = 0; AudioBufferList abl; - framecnt_t per_channel; + samplecnt_t per_channel; bool at_end = false; abl.mNumberBuffers = 1; @@ -104,13 +104,13 @@ CAImportableSource::channels () const return af.GetFileDataFormat().NumberChannels(); } -framecnt_t +samplecnt_t CAImportableSource::length () const { - return af.GetNumberFrames(); + return af.GetNumberSamples(); } -framecnt_t +samplecnt_t CAImportableSource::samplerate () const { CAStreamBasicDescription client_asbd; @@ -126,7 +126,7 @@ CAImportableSource::samplerate () const } void -CAImportableSource::seek (framepos_t pos) +CAImportableSource::seek (samplepos_t pos) { try { af.Seek (pos); -- cgit v1.2.3