diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-12 06:29:43 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-12 06:30:01 +0200 |
| commit | 030e19816a8933a8c6c0a4d8193251446d4ee514 (patch) | |
| tree | 827cfc97a1a8f0f660238e2a3b5472669f0f2077 /src/multimedia/audio/qsoundeffect.cpp | |
| parent | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (diff) | |
| parent | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
Diffstat (limited to 'src/multimedia/audio/qsoundeffect.cpp')
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index d3b818073..f8b8d7b18 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -298,11 +298,7 @@ qreal QSoundEffect::volume() const */ void QSoundEffect::setVolume(qreal volume) { - if (volume < qreal(0.0) || volume > qreal(1.0)) { - qWarning("SoundEffect: volume should be between 0.0 and 1.0"); - return; - } - + volume = qBound(qreal(0.0), volume, qreal(1.0)); if (qFuzzyCompare(d->volume(), volume)) return; |