Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ieb1a3081907093e31e8c8b7f95993bb3b2173672

1 files changed, 2 insertions, 6 deletions

diff --git a/src/plugins/pulseaudio/qaudioinput_pulse.h b/src/plugins/pulseaudio/qaudioinput_pulse.h
index c04cd1299..32a2c031c 100644
--- a/src/plugins/pulseaudio/qaudioinput_pulse.h
+++ b/src/plugins/pulseaudio/qaudioinput_pulse.h
@@ -106,8 +106,6 @@ public:
     QAudio::Error m_errorState;
     QAudio::State m_deviceState;
     qreal m_volume;
-    bool m_customVolumeRequired;
-    pa_cvolume m_chVolume;
 
 private slots:
     void userFeed();
@@ -118,13 +116,11 @@ private:
     void setState(QAudio::State state);
     void setError(QAudio::Error error);
 
+    void applyVolume(const void *src, void *dest, int len);
+
     int checkBytesReady();
     bool open();
     void close();
-    void setPulseVolume();
-
-    static void sourceInfoCallback(pa_context *c, const pa_source_info *i, int eol, void *userdata);
-    static void inputVolumeCallback(pa_context *context, int success, void *userdata);
 
     bool m_pullMode;
     bool m_opened;