diff audio/AudioCallbackPlaySource.h @ 550:c732251237b1 bqresample

Merge from branch 3.0-integration

--- a/audio/AudioCallbackPlaySource.h	Wed Dec 07 11:52:26 2016 +0000
+++ b/audio/AudioCallbackPlaySource.h	Wed Dec 07 12:04:41 2016 +0000
@@ -168,6 +168,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 +400,6 @@
     QMutex m_mutex;
     QWaitCondition m_condition;
     FillThread *m_fillThread;
-    breakfastquay::Resampler *m_resampler;
-    void initialiseResampler();
 };
 
 #endif