Use glibmm to simplify my earlier efforts with 'user_config_directory()' and 'user_ca...

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

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index d741dd008b4630962c4c7f0f5596aa32457da2ae..ceb88eddc9f80c4ae61a87b41e9c1b092a59dad3 100644 (file)
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -13,8 +13,8 @@ SndFileImportableSource::get_timecode_info (SNDFILE* sf, SF_BROADCAST_INFO* binf
        if (sf_command (sf, SFC_GET_BROADCAST_INFO, binfo, sizeof (*binfo)) != SF_TRUE) {
                exists = false;
                return 0;
-       } 
-       
+       }
+
        exists = true;
        int64_t ret = (uint32_t) binfo->time_reference_high;
        ret <<= 32;
@@ -27,13 +27,13 @@ SndFileImportableSource::SndFileImportableSource (const string& path)
        memset(&sf_info, 0 , sizeof(sf_info));
        in.reset( sf_open(path.c_str(), SFM_READ, &sf_info), sf_close);
        if (!in) throw failed_constructor();
-       
+
        SF_BROADCAST_INFO binfo;
        bool timecode_exists;
 
        memset (&binfo, 0, sizeof (binfo));
        timecode = get_timecode_info (in.get(), &binfo, timecode_exists);
-       
+
        if (!timecode_exists) {
                timecode = 0;
        }
@@ -43,40 +43,49 @@ SndFileImportableSource::~SndFileImportableSource ()
 {
 }
 
-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
-SndFileImportableSource::channels () const 
+uint32_t
+SndFileImportableSource::channels () const
 {
        return sf_info.channels;
 }
 
-nframes_t
-SndFileImportableSource::length () const 
+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 && type != SF_FORMAT_OGG);
 }