Merge branch 'master' of git.ardour.org:ardour/ardour

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

diff --git a/libs/ardour/sndfileimportable.cc b/libs/ardour/sndfileimportable.cc
index 75bfb9da57cd11f24cac3cf529e7a563471df9e7..c9f6c4014f272f75e54b99610c2a70f7d3eebf63 100644 (file)
--- a/libs/ardour/sndfileimportable.cc
+++ b/libs/ardour/sndfileimportable.cc
@@ -84,7 +84,8 @@ SndFileImportableSource::natural_position () const
 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);
 }