diff options
author | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-10-11 20:16:38 +0300 |
commit | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (patch) | |
tree | 40fd93907c281b8947bc8db916419e0e9b928c6e /src/multimedia/audio/qaudiooutput.cpp | |
parent | 54521ea05d2208a31b6111d5b9248ca7bf2f97ec (diff) | |
parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I8cfa9cb233675bb7ff842118d96ec8ac0b97964f
Diffstat (limited to 'src/multimedia/audio/qaudiooutput.cpp')
-rw-r--r-- | src/multimedia/audio/qaudiooutput.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/audio/qaudiooutput.cpp b/src/multimedia/audio/qaudiooutput.cpp index 670dca7bc..e37da9bdf 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -364,7 +364,8 @@ QAudio::State QAudioOutput::state() const */ void QAudioOutput::setVolume(qreal volume) { - d->setVolume(volume); + qreal v = qBound(qreal(0.0), volume, qreal(1.0)); + d->setVolume(v); } /*! |