comparison audio/AudioCallbackPlaySource.cpp @ 552:8c11ca1ebc39 bqresample

Some fixes to sample rate management

 	buffersChanged = true;
     } else {
 	if (willPlay) clearRingBuffers(true);
     }
 
-    if (buffersChanged || srChanged) {
-
-        // There are more channels than there were before, or the
-        // source sample rate has changed
-
-        //!!!
-
+    if (srChanged) {
+        SVCERR << "AudioCallbackPlaySource: Source rate changed" << endl;
+        if (m_resamplerWrapper) {
+            SVCERR << "AudioCallbackPlaySource: Source sample rate changed to "
+                << m_sourceSampleRate << ", updating resampler wrapper" << endl;
+            m_resamplerWrapper->changeApplicationSampleRate
+                (int(round(m_sourceSampleRate)));
+            m_resamplerWrapper->reset();
+        }
     }
 
     rebuildRangeLists();
 
     m_mutex.unlock();

 {
     clearRingBuffers();
 }
 
 void
-AudioCallbackPlaySource::preferenceChanged(PropertyContainer::PropertyName n)
+AudioCallbackPlaySource::preferenceChanged(PropertyContainer::PropertyName )
 {
 }
 
 void
 AudioCallbackPlaySource::audioProcessingOverload()

 
 void
 AudioCallbackPlaySource::setResamplerWrapper(breakfastquay::ResamplerWrapper *w)
 {
     m_resamplerWrapper = w;
+    if (m_resamplerWrapper && m_sourceSampleRate != 0) {
+        m_resamplerWrapper->changeApplicationSampleRate
+            (int(round(m_sourceSampleRate)));
+    }
 }
 
 void
 AudioCallbackPlaySource::setSystemPlaybackBlockSize(int size)
 {

         setTimeStretch(m_stretchRatio);
     }
 }
 
 void
-AudioCallbackPlaySource::setSystemPlaybackChannelCount(int c)
+AudioCallbackPlaySource::setSystemPlaybackChannelCount(int)
 {
 }
 
 void
 AudioCallbackPlaySource::setAuditioningEffect(Auditionable *a)

     cout << "buffered to " << f << " already" << endl;
 #endif
 
     int channels = getTargetChannelCount();
 
-    sv_frame_t orig = space;
-
     static float **bufferPtrs = 0;
     static int bufferPtrCount = 0;
 
     if (bufferPtrCount < channels) {
 	if (bufferPtrs) delete[] bufferPtrs;