{
}
-nframes_t
-SndFileImportableSource::read (Sample* buffer, nframes_t nframes)
+framecnt_t
+SndFileImportableSource::read (Sample* buffer, framecnt_t nframes)
{
- nframes_t per_channel = nframes / sf_info.channels;
+ framecnt_t per_channel = nframes / sf_info.channels;
per_channel = sf_readf_float (in.get(), buffer, per_channel);
return per_channel * sf_info.channels;
}
-uint
+uint32_t
SndFileImportableSource::channels () const
{
return sf_info.channels;
}
-nframes_t
+framecnt_t
SndFileImportableSource::length () const
{
- return sf_info.frames;
+ return (framecnt_t) sf_info.frames;
}
-nframes_t
-SndFileImportableSource::samplerate() const
+framecnt_t
+SndFileImportableSource::samplerate () const
{
return sf_info.samplerate;
}
void
-SndFileImportableSource::seek (nframes_t /*pos*/)
+SndFileImportableSource::seek (framepos_t /*pos*/)
{
sf_seek (in.get(), 0, SEEK_SET);
}
-nframes64_t
+framepos_t
SndFileImportableSource::natural_position () const
{
- return timecode;
+ return (framepos_t) timecode;
}
bool
SndFileImportableSource::clamped_at_unity () const
{
+ int const type = sf_info.format & SF_FORMAT_TYPEMASK;
int const sub = sf_info.format & SF_FORMAT_SUBMASK;
/* XXX: this may not be the full list of formats that are unclamped */
- return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE);
+ return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE && type != SF_FORMAT_OGG);
}