diff audio/AudioCallbackPlaySource.h @ 546:4de547a5905c 3.0-integration

Update for bqaudioio changes

--- a/audio/AudioCallbackPlaySource.h	Mon Dec 05 16:54:19 2016 +0000
+++ b/audio/AudioCallbackPlaySource.h	Tue Dec 06 15:59:06 2016 +0000
@@ -39,10 +39,6 @@
     class RubberBandStretcher;
 }
 
-namespace breakfastquay {
-    class Resampler;
-}
-
 class Model;
 class ViewManagerBase;
 class AudioGenerator;
@@ -168,6 +164,13 @@
     virtual sv_samplerate_t getTargetSampleRate() const;
 
     /**
+     * Indicate how many channels the target audio device was opened
+     * with. Note that the target device does channel mixing in the
+     * case where our requested channel count does not match its.
+     */
+    void setSystemPlaybackChannelCount(int);
+    
+    /**
      * Set the current output levels for metering (for call from the
      * target)
      */
@@ -393,8 +396,6 @@
     QMutex m_mutex;
     QWaitCondition m_condition;
     FillThread *m_fillThread;
-    breakfastquay::Resampler *m_resampler;
-    void initialiseConverter();
 };
 
 #endif