Add a QAudioDevice property to QSoundEffect

Without it, the QML SoundEffect can't target a non default
device.

Change-Id: I114a1e712cdc4ff1bfdc4b131db97cbe4d6eb90f
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>

2 files changed, 19 insertions, 0 deletions

diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp
index ffd47e28c..80fcef9c6 100644
--- a/src/multimedia/audio/qsoundeffect.cpp
+++ b/src/multimedia/audio/qsoundeffect.cpp
@@ -483,6 +483,20 @@ void QSoundEffect::setLoopCount(int loopCount)
     emit loopCountChanged();
 }
 
+QAudioDevice QSoundEffect::audioDevice()
+{
+    return d->m_audioDevice;
+}
+
+void QSoundEffect::setAudioDevice(const QAudioDevice &device)
+{
+    if (d->m_audioDevice == device)
+        return;
+    // ### recreate the QAudioSink if needed
+    d->m_audioDevice = device;
+    emit audioDeviceChanged();
+}
+
 /*!
     \qmlproperty int QtMultimedia::SoundEffect::loopsRemaining
 
diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h
index 60a7323a5..5b806b382 100644
--- a/src/multimedia/audio/qsoundeffect.h
+++ b/src/multimedia/audio/qsoundeffect.h
@@ -64,6 +64,7 @@ class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject
     Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
     Q_PROPERTY(bool playing READ isPlaying NOTIFY playingChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
+    Q_PROPERTY(QAudioDevice audioDevice READ audioDevice WRITE setAudioDevice NOTIFY audioDeviceChanged)
 
 public:
     enum Loop
@@ -94,6 +95,9 @@ public:
     int loopsRemaining() const;
     void setLoopCount(int loopCount);
 
+    QAudioDevice audioDevice();
+    void setAudioDevice(const QAudioDevice &device);
+
     float volume() const;
     void setVolume(float volume);
 
@@ -114,6 +118,7 @@ Q_SIGNALS:
     void loadedChanged();
     void playingChanged();
     void statusChanged();
+    void audioDeviceChanged();
 
 public Q_SLOTS:
     void play();