changeset 1330:491a992f856e 3.0-integration

Merge
author Chris Cannam
date Thu, 15 Dec 2016 08:59:19 +0000
parents ccc8658914ef (current diff) 5b04b8bc88ca (diff)
children 576be7933ec7
files
diffstat 1 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.cpp	Wed Dec 14 14:28:41 2016 +0000
+++ b/data/fileio/CodedAudioFileReader.cpp	Thu Dec 15 08:59:19 2016 +0000
@@ -144,10 +144,13 @@
     }
     if (m_fileRate != m_sampleRate) {
         SVDEBUG << "CodedAudioFileReader: resampling " << m_fileRate << " -> " <<  m_sampleRate << endl;
-        m_resampler = new breakfastquay::Resampler
-            (breakfastquay::Resampler::FastestTolerable,
-             m_channelCount,
-             int(m_cacheWriteBufferFrames));
+
+        breakfastquay::Resampler::Parameters params;
+        params.quality = breakfastquay::Resampler::FastestTolerable;
+        params.maxBufferSize = int(m_cacheWriteBufferFrames);
+        params.initialSampleRate = m_fileRate;
+        m_resampler = new breakfastquay::Resampler(params, m_channelCount);
+
         double ratio = m_sampleRate / m_fileRate;
         m_resampleBufferFrames = int(ceil(double(m_cacheWriteBufferFrames) *
                                           ratio + 1));