diff options
author | Tim Blechmann <tim@klingt.org> | 2024-03-12 10:43:00 +0800 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-14 17:40:50 +0000 |
commit | 996a032cc5d0f0c33a39774f2655ebf6b89e1e5f (patch) | |
tree | 94da92545029bec0e7f904165dfd7bdac1e9cde8 | |
parent | adcdda338be1badbc132c9ba99dec64ea42c5ba1 (diff) |
GStreamer: clean up AudioInput/AudioOutput
The `QPlatformAudioXput` classes have `volume`/`muted` members. The
GStreamer implementations should use these members.
Pick-to: 6.5
Change-Id: Ic95382cc7801200b1fa0db7b150a88825fe1b583
Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
(cherry picked from commit d5ce9c48a2643e08e7a628458345e23e64900f6c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5002aa7db12abcf520d47f67f95e59cc5b9fb652)
4 files changed, 8 insertions, 30 deletions
diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp index a20293527..ad00903e8 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput.cpp @@ -52,29 +52,13 @@ QGstreamerAudioInput::~QGstreamerAudioInput() gstAudioInput.setStateSync(GST_STATE_NULL); } -int QGstreamerAudioInput::volume() const +void QGstreamerAudioInput::setVolume(float volume) { - return m_volume; -} - -bool QGstreamerAudioInput::isMuted() const -{ - return m_muted; -} - -void QGstreamerAudioInput::setVolume(float vol) -{ - if (vol == m_volume) - return; - m_volume = vol; - audioVolume.set("volume", vol); + audioVolume.set("volume", volume); } void QGstreamerAudioInput::setMuted(bool muted) { - if (muted == m_muted) - return; - m_muted = muted; audioVolume.set("mute", muted); } diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h index 4337626be..f88d14419 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudioinput_p.h @@ -34,24 +34,18 @@ public: static QMaybe<QPlatformAudioInput *> create(QAudioInput *parent); ~QGstreamerAudioInput(); - int volume() const; - bool isMuted() const; - bool setAudioInput(const QAudioDevice &); QAudioDevice audioInput() const; void setAudioDevice(const QAudioDevice &) override; - void setVolume(float volume) override; - void setMuted(bool muted) override; + void setVolume(float) override; + void setMuted(bool) override; QGstElement gstElement() const { return gstAudioInput; } private: QGstreamerAudioInput(QGstElement autoaudiosrc, QGstElement volume, QAudioInput *parent); - float m_volume = 1.; - bool m_muted = false; - QAudioDevice m_audioDevice; // Gst elements diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp index b12cae747..0f4d6fa29 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput.cpp @@ -58,9 +58,9 @@ QGstreamerAudioOutput::~QGstreamerAudioOutput() gstAudioOutput.setStateSync(GST_STATE_NULL); } -void QGstreamerAudioOutput::setVolume(float vol) +void QGstreamerAudioOutput::setVolume(float volume) { - audioVolume.set("volume", vol); + audioVolume.set("volume", volume); } void QGstreamerAudioOutput::setMuted(bool muted) diff --git a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h index 2a478630e..2a936c63b 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h +++ b/src/plugins/multimedia/gstreamer/common/qgstreameraudiooutput_p.h @@ -35,8 +35,8 @@ public: ~QGstreamerAudioOutput(); void setAudioDevice(const QAudioDevice &) override; - void setVolume(float volume) override; - void setMuted(bool muted) override; + void setVolume(float) override; + void setMuted(bool) override; void setPipeline(const QGstPipeline &pipeline); |