X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsndfileimportable.cc;h=c9f6c4014f272f75e54b99610c2a70f7d3eebf63;hb=f66b919e298c1c4e5f780942a1ed75e262a6ee96;hp=99697b888f6918dc613e39afd874c778e1ac4f45;hpb=ac3265d7f49b9c7e0cc78438d92013f359a7c02e;p=ardour.git

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index 99697b888f..c9f6c4014f 100644
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -43,10 +43,10 @@ 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;
 }
@@ -57,34 +57,35 @@ 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 && sub != SF_FORMAT_OGG);
+	return (sub != SF_FORMAT_FLOAT && sub != SF_FORMAT_DOUBLE && type != SF_FORMAT_OGG);
 }