Return silence from read_from_sources() if we try to read a channel that our source...

[ardour.git] / libs / ardour / caimportable.cc

diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc
index 71927c95e5a333fec9b335cb5067d24ae260a1af..149f213222def48b574f0d236ee4dcc072fe7a8f 100644 (file)
--- a/libs/ardour/caimportable.cc
+++ b/libs/ardour/caimportable.cc
@@ -36,12 +36,12 @@ CAImportableSource::~CAImportableSource ()
 {
 }
 
-nframes_t
-CAImportableSource::read (Sample* buffer, nframes_t nframes)
+framecnt_t
+CAImportableSource::read (Sample* buffer, framecnt_t nframes)
 {
-       nframes_t nread = 0;
+       framecnt_t nread = 0;
        AudioBufferList abl;
-       nframes_t per_channel;
+       framecnt_t per_channel;
        bool at_end = false;
 
        abl.mNumberBuffers = 1;
@@ -85,14 +85,14 @@ CAImportableSource::channels () const
        return af.GetFileDataFormat().NumberChannels();
 }
 
-nframes_t
+framecnt_t
 CAImportableSource::length () const
 {
        return af.GetNumberFrames();
 }
 
-nframes_t
-CAImportableSource::samplerate() const
+framecnt_t
+CAImportableSource::samplerate () const
 {
        CAStreamBasicDescription client_asbd;
 
@@ -107,7 +107,7 @@ CAImportableSource::samplerate() const
 }
 
 void
-CAImportableSource::seek (nframes_t pos)
+CAImportableSource::seek (framepos_t pos)
 {
        try {
                af.Seek (pos);