diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 12:41:04 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 12:41:04 +0200 |
commit | 1f61939866de0ead1771a2e07f2e2f1d393643a5 (patch) | |
tree | a7a4e78126f603e931df651d6837f15d9ffc0dfe /src/multimedia/audio/qaudiooutput.h | |
parent | 60b3c6f54d65d03bb028ecade8fd130cfe1ba5c7 (diff) | |
parent | 36fbb6ab08734aff1a73ea4ed255e06bd5aa99f8 (diff) |
Merge remote-tracking branch 'origin/dev' into 6.2
Change-Id: I84ab4bc68611159d8e0d211a509e328319b7cb96
Diffstat (limited to 'src/multimedia/audio/qaudiooutput.h')
-rw-r--r-- | src/multimedia/audio/qaudiooutput.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index 9a4cf3998..0f1461a55 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -55,7 +55,6 @@ class Q_MULTIMEDIA_EXPORT QAudioOutput : public QObject Q_PROPERTY(QAudioDevice device READ device WRITE setDevice NOTIFY deviceChanged) Q_PROPERTY(float volume READ volume WRITE setVolume NOTIFY volumeChanged) Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged) - Q_PROPERTY(QAudio::Role audioRole READ audioRole WRITE setAudioRole NOTIFY audioRoleChanged) public: explicit QAudioOutput(QObject *parent = nullptr); @@ -65,21 +64,16 @@ public: QAudioDevice device() const; float volume() const; bool isMuted() const; - QAudio::Role audioRole() const; - - QList<QAudio::Role> supportedAudioRoles() const; public Q_SLOTS: void setDevice(const QAudioDevice &device); void setVolume(float volume); void setMuted(bool muted); - void setAudioRole(QAudio::Role audioRole); Q_SIGNALS: void deviceChanged(); void volumeChanged(float volume); void mutedChanged(bool muted); - void audioRoleChanged(QAudio::Role role); public: QPlatformAudioOutput *handle() const { return d; } |