af.SetClientFormat (client_format);
} catch (CAXException& cax) {
- error << string_compose ("CAImportable: %1", cax.mOperation) << endmsg;
+ //Don't report an error here since there is one higher up in import.
+ //Since libsndfile gets tried second, any failures here may show as
+ //invalid errors in the Error log.
throw failed_constructor ();
}
{
}
-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;
per_channel = nframes / abl.mBuffers[0].mNumberChannels;
while (nread < per_channel) {
-
+
UInt32 new_cnt = per_channel - nread;
-
+
abl.mBuffers[0].mDataByteSize = new_cnt * abl.mBuffers[0].mNumberChannels * sizeof(Sample);
abl.mBuffers[0].mData = buffer + nread;
-
+
try {
af.Read (new_cnt, &abl);
} catch (CAXException& cax) {
if (!at_end && nread < per_channel) {
return 0;
} else {
- return nread * abl.mBuffers[0].mNumberChannels;
+ return nread * abl.mBuffers[0].mNumberChannels;
}
}
uint
-CAImportableSource::channels () const
+CAImportableSource::channels () const
{
return af.GetFileDataFormat().NumberChannels();
}
-nframes_t
-CAImportableSource::length () const
+framecnt_t
+CAImportableSource::length () const
{
return af.GetNumberFrames();
}
-nframes_t
-CAImportableSource::samplerate() const
+framecnt_t
+CAImportableSource::samplerate () const
{
CAStreamBasicDescription client_asbd;
}
void
-CAImportableSource::seek (nframes_t pos)
+CAImportableSource::seek (framepos_t pos)
{
try {
af.Seek (pos);
}
}
-
+