Remove unused field and clean up member initialization

Fix a warning about a member variable that's unused on iOS,
and clean up member initialization while we're at it.

Change-Id: I83c01e2f8435ecc8201b37e50562681ab6a80eb9
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit d6afa086dd690bf4c28cf91a9cab75abce3fc03f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

2 files changed, 18 insertions, 27 deletions

diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm b/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
index f84bdeaa0..5fd5afbdf 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosink.mm
@@ -59,8 +59,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static const int DEFAULT_BUFFER_SIZE = 8 * 1024;
-
 QDarwinAudioSinkBuffer::QDarwinAudioSinkBuffer(int bufferSize, int maxPeriodSize, const QAudioFormat &audioFormat)
     : m_deviceError(false)
     , m_maxPeriodSize(maxPeriodSize)
@@ -223,17 +221,6 @@ qint64 QDarwinAudioSinkDevice::writeData(const char *data, qint64 len)
 
 QDarwinAudioSink::QDarwinAudioSink(const QAudioDevice &device)
     : m_audioDeviceInfo(device)
-    , m_isOpen(false)
-    , m_internalBufferSize(DEFAULT_BUFFER_SIZE)
-    , m_totalFrames(0)
-    , m_audioIO(0)
-    , m_audioUnit(0)
-    , m_audioBuffer(0)
-    , m_cachedVolume(1.0)
-    , m_volume(1.0)
-    , m_pullMode(false)
-    , m_errorCode(QAudio::NoError)
-    , m_stateCode(QAudio::StoppedState)
 {
     QAudioDevice di = device;
     if (di.isNull())
diff --git a/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h b/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
index 6bc0ff272..bb2c6507f 100644
--- a/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
+++ b/src/multimedia/platform/darwin/audio/qdarwinaudiosink_p.h
@@ -179,28 +179,32 @@ private:
     QAudioDevice m_audioDeviceInfo;
     QByteArray m_device;
 
-    bool m_isOpen;
-    int m_internalBufferSize;
-    int m_periodSizeBytes;
-    qint64 m_totalFrames;
+    static constexpr int DEFAULT_BUFFER_SIZE = 8 * 1024;
+
+    bool m_isOpen = false;
+    int m_internalBufferSize = DEFAULT_BUFFER_SIZE;
+    int m_periodSizeBytes = 0;
+    qint64 m_totalFrames = 0;
     QAudioFormat m_audioFormat;
-    QIODevice *m_audioIO;
-#if defined(Q_OS_OSX)
+    QIODevice *m_audioIO = nullptr;
+#if defined(Q_OS_MACOS)
     AudioDeviceID m_audioDeviceId;
 #endif
-    AudioUnit m_audioUnit;
-    Float64 m_clockFrequency;
+    AudioUnit m_audioUnit = 0;
+    Float64 m_clockFrequency = 0;
     AudioStreamBasicDescription m_streamFormat;
-    QDarwinAudioSinkBuffer *m_audioBuffer;
+    QDarwinAudioSinkBuffer *m_audioBuffer = nullptr;
     QAtomicInt m_audioThreadState;
     QWaitCondition m_threadFinished;
     QMutex m_mutex;
-    qreal m_cachedVolume;
-    qreal m_volume;
-    bool m_pullMode;
+    qreal m_cachedVolume = 1.;
+#if defined(Q_OS_MACOS)
+    qreal m_volume = 1.;
+#endif
+    bool m_pullMode = false;
 
-    QAudio::Error m_errorCode;
-    QAudio::State m_stateCode;
+    QAudio::Error m_errorCode = QAudio::NoError;
+    QAudio::State m_stateCode = QAudio::StoppedState;
 };
 
 QT_END_NAMESPACE