Move the QAudio::Mode enum inside QAudioDevice

QAudioDevice is the only class using that enum, so it makes
more sense for the enum to live there.

Change-Id: I11e6768d1114d63e68d1956f7d6e62786524c291
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

4 files changed, 22 insertions, 22 deletions

diff --git a/examples/multimedia/spectrum/app/engine.cpp b/examples/multimedia/spectrum/app/engine.cpp
index 78aef1412..6d07a9817 100644
--- a/examples/multimedia/spectrum/app/engine.cpp
+++ b/examples/multimedia/spectrum/app/engine.cpp
@@ -78,7 +78,7 @@ const int    LevelWindowUs          = 0.1 * 1000000;
 
 Engine::Engine(QObject *parent)
     :   QObject(parent)
-    ,   m_mode(QAudio::AudioInput)
+    ,   m_mode(QAudioDevice::Input)
     ,   m_state(QAudio::StoppedState)
     ,   m_devices(new QMediaDevices(this))
     ,   m_generateTone(false)
@@ -225,7 +225,7 @@ void Engine::setWindowFunction(WindowFunction type)
 void Engine::startRecording()
 {
     if (m_audioInput) {
-        if (QAudio::AudioInput == m_mode &&
+        if (QAudioDevice::Input == m_mode &&
             QAudio::SuspendedState == m_state) {
             m_audioInput->resume();
         } else {
@@ -235,7 +235,7 @@ void Engine::startRecording()
             m_buffer.fill(0);
             setRecordPosition(0, true);
             stopPlayback();
-            m_mode = QAudio::AudioInput;
+            m_mode = QAudioDevice::Input;
             connect(m_audioInput, &QAudioSource::stateChanged,
                     this, &Engine::audioStateChanged);
 
@@ -253,7 +253,7 @@ void Engine::startRecording()
 void Engine::startPlayback()
 {
     if (m_audioOutput) {
-        if (QAudio::AudioOutput == m_mode &&
+        if (QAudioDevice::Output == m_mode &&
             QAudio::SuspendedState == m_state) {
 #ifdef Q_OS_WIN
             // The Windows backend seems to internally go back into ActiveState
@@ -267,7 +267,7 @@ void Engine::startPlayback()
             spectrumChanged(0, 0, FrequencySpectrum());
             setPlayPosition(0, true);
             stopRecording();
-            m_mode = QAudio::AudioOutput;
+            m_mode = QAudioDevice::Output;
             connect(m_audioOutput, &QAudioSink::stateChanged,
                     this, &Engine::audioStateChanged);
 
@@ -293,10 +293,10 @@ void Engine::suspend()
     if (QAudio::ActiveState == m_state ||
         QAudio::IdleState == m_state) {
         switch (m_mode) {
-        case QAudio::AudioInput:
+        case QAudioDevice::Input:
             m_audioInput->suspend();
             break;
-        case QAudio::AudioOutput:
+        case QAudioDevice::Output:
             m_audioOutput->suspend();
             break;
         }
@@ -328,7 +328,7 @@ void Engine::setAudioOutputDevice(const QAudioDevice &device)
 void Engine::audioNotify()
 {
     switch (m_mode) {
-    case QAudio::AudioInput: {
+    case QAudioDevice::Input: {
             const qint64 recordPosition = qMin(m_bufferLength, m_format.bytesForDuration(m_audioInput->processedUSecs()));
             setRecordPosition(recordPosition);
             const qint64 levelPosition = m_dataLength - m_levelBufferLength;
@@ -341,7 +341,7 @@ void Engine::audioNotify()
             emit bufferChanged(0, m_dataLength, m_buffer);
         }
         break;
-    case QAudio::AudioOutput: {
+    case QAudioDevice::Output: {
             const qint64 playPosition = m_format.bytesForDuration(m_audioOutput->processedUSecs());
             setPlayPosition(qMin(bufferLength(), playPosition));
             const qint64 levelPosition = playPosition - m_levelBufferLength;
@@ -395,10 +395,10 @@ void Engine::audioStateChanged(QAudio::State state)
             // Check error
             QAudio::Error error = QAudio::NoError;
             switch (m_mode) {
-            case QAudio::AudioInput:
+            case QAudioDevice::Input:
                 error = m_audioInput->error();
                 break;
-            case QAudio::AudioOutput:
+            case QAudioDevice::Output:
                 error = m_audioOutput->error();
                 break;
             }
@@ -459,7 +459,7 @@ void Engine::reset()
 {
     stopRecording();
     stopPlayback();
-    setState(QAudio::AudioInput, QAudio::StoppedState);
+    setState(QAudioDevice::Input, QAudio::StoppedState);
     setFormat(QAudioFormat());
     m_generateTone = false;
     delete m_file;
@@ -604,7 +604,7 @@ void Engine::setState(QAudio::State state)
         emit stateChanged(m_mode, m_state);
 }
 
-void Engine::setState(QAudio::Mode mode, QAudio::State state)
+void Engine::setState(QAudioDevice::Mode mode, QAudio::State state)
 {
     const bool changed = (m_mode != mode || m_state != state);
     m_mode = mode;
diff --git a/examples/multimedia/spectrum/app/engine.h b/examples/multimedia/spectrum/app/engine.h
index 1ee87a2a5..449884251 100644
--- a/examples/multimedia/spectrum/app/engine.h
+++ b/examples/multimedia/spectrum/app/engine.h
@@ -99,7 +99,7 @@ public:
     const QList<QAudioDevice> &availableAudioOutputDevices() const
                                     { return m_availableAudioOutputDevices; }
 
-    QAudio::Mode mode() const { return m_mode; }
+    QAudioDevice::Mode mode() const { return m_mode; }
     QAudio::State state() const { return m_state; }
 
     /**
@@ -182,7 +182,7 @@ public slots:
     void setAudioOutputDevice(const QAudioDevice &device);
 
 signals:
-    void stateChanged(QAudio::Mode mode, QAudio::State state);
+    void stateChanged(QAudioDevice::Mode mode, QAudio::State state);
 
     /**
      * Informational message for non-modal display
@@ -259,7 +259,7 @@ private:
     void stopRecording();
     void stopPlayback();
     void setState(QAudio::State state);
-    void setState(QAudio::Mode mode, QAudio::State state);
+    void setState(QAudioDevice::Mode mode, QAudio::State state);
     void setFormat(const QAudioFormat &format);
     void setRecordPosition(qint64 position, bool forceEmit = false);
     void setPlayPosition(qint64 position, bool forceEmit = false);
@@ -277,7 +277,7 @@ private:
 #endif
 
 private:
-    QAudio::Mode        m_mode;
+    QAudioDevice::Mode        m_mode;
     QAudio::State       m_state;
     QMediaDevices      *m_devices;
 
diff --git a/examples/multimedia/spectrum/app/mainwidget.cpp b/examples/multimedia/spectrum/app/mainwidget.cpp
index 9a6fa0ac5..2dbfda9ab 100644
--- a/examples/multimedia/spectrum/app/mainwidget.cpp
+++ b/examples/multimedia/spectrum/app/mainwidget.cpp
@@ -110,7 +110,7 @@ MainWidget::~MainWidget() = default;
 // Public slots
 //-----------------------------------------------------------------------------
 
-void MainWidget::stateChanged(QAudio::Mode mode, QAudio::State state)
+void MainWidget::stateChanged(QAudioDevice::Mode mode, QAudio::State state)
 {
     Q_UNUSED(mode);
 
@@ -409,7 +409,7 @@ void MainWidget::createMenus()
 
 void MainWidget::updateButtonStates()
 {
-    const bool recordEnabled = ((QAudio::AudioOutput == m_engine->mode() ||
+    const bool recordEnabled = ((QAudioDevice::Output == m_engine->mode() ||
                                 (QAudio::ActiveState != m_engine->state() &&
                                  QAudio::IdleState != m_engine->state())) &&
                                 RecordMode == m_mode);
@@ -420,7 +420,7 @@ void MainWidget::updateButtonStates()
     m_pauseButton->setEnabled(pauseEnabled);
 
     const bool playEnabled = (/*m_engine->dataLength() &&*/
-                              (QAudio::AudioOutput != m_engine->mode() ||
+                              (QAudioDevice::Output != m_engine->mode() ||
                                (QAudio::ActiveState != m_engine->state() &&
                                 QAudio::IdleState != m_engine->state())));
     m_playButton->setEnabled(playEnabled);
diff --git a/examples/multimedia/spectrum/app/mainwidget.h b/examples/multimedia/spectrum/app/mainwidget.h
index 2ff863a13..d2340daae 100644
--- a/examples/multimedia/spectrum/app/mainwidget.h
+++ b/examples/multimedia/spectrum/app/mainwidget.h
@@ -51,7 +51,7 @@
 #ifndef MAINWIDGET_H
 #define MAINWIDGET_H
 
-#include <QAudio>
+#include <QAudioDevice>
 #include <QIcon>
 #include <QWidget>
 
@@ -88,7 +88,7 @@ public:
     void timerEvent(QTimerEvent *event) override;
 
 public slots:
-    void stateChanged(QAudio::Mode mode, QAudio::State state);
+    void stateChanged(QAudioDevice::Mode mode, QAudio::State state);
     void formatChanged(const QAudioFormat &format);
     void spectrumChanged(qint64 position, qint64 length,
                          const FrequencySpectrum &spectrum);