diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-06-11 14:22:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 10:03:15 +0200 |
| commit | 5ad88be6f078aa16f3d2821a7589c8d1c1a12671 (patch) | |
| tree | af17ae3eb67352ae7ca040213488b3bc7a69a0a3 | |
| parent | 634894a8a83b021386da8c2672628b0b26185ef3 (diff) | |
The volume property should use float
To be consistent across Qt Multimedia
Change-Id: Id0cea5bc1c844e43448107d1cf2a2b22ad297109
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 8 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.h | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index 44627921b..ffd47e28c 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -96,7 +96,7 @@ public: QAudioSink *m_audioOutput = nullptr; QSample *m_sample = nullptr; bool m_muted = false; - qreal m_volume = 1.0; + float m_volume = 1.0; bool m_sampleReady = false; qint64 m_offset = 0; QAudioDevice m_audioDevice; @@ -525,7 +525,7 @@ int QSoundEffect::loopsRemaining() const /*! Returns the current volume of this sound effect, from 0.0 (silent) to 1.0 (maximum volume). */ -qreal QSoundEffect::volume() const +float QSoundEffect::volume() const { if (d->m_audioOutput && !d->m_muted) return d->m_audioOutput->volume(); @@ -545,9 +545,9 @@ qreal QSoundEffect::volume() const will produce linear changes in perceived loudness, which is what a user would normally expect from a volume control. See QAudio::convertVolume() for more details. */ -void QSoundEffect::setVolume(qreal volume) +void QSoundEffect::setVolume(float volume) { - volume = qBound(qreal(0.0), volume, qreal(1.0)); + volume = qBound(0.0f, volume, 1.0f); if (d->m_volume == volume) return; diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h index 155084249..60a7323a5 100644 --- a/src/multimedia/audio/qsoundeffect.h +++ b/src/multimedia/audio/qsoundeffect.h @@ -60,7 +60,7 @@ class Q_MULTIMEDIA_EXPORT QSoundEffect : public QObject Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(int loops READ loopCount WRITE setLoopCount NOTIFY loopCountChanged) Q_PROPERTY(int loopsRemaining READ loopsRemaining NOTIFY loopsRemainingChanged) - Q_PROPERTY(qreal volume READ volume WRITE setVolume NOTIFY volumeChanged) + Q_PROPERTY(float volume READ volume WRITE setVolume NOTIFY volumeChanged) 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) @@ -94,8 +94,8 @@ public: int loopsRemaining() const; void setLoopCount(int loopCount); - qreal volume() const; - void setVolume(qreal volume); + float volume() const; + void setVolume(float volume); bool isMuted() const; void setMuted(bool muted); |