summaryrefslogtreecommitdiff
path: root/libs/ardour/caimportable.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/caimportable.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/caimportable.cc')
-rw-r--r--libs/ardour/caimportable.cc16
1 files changed, 8 insertions, 8 deletions
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);