diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-06 15:44:38 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-10-06 15:44:38 +0200 |
| commit | c954fe7f171c0602cdb555ef10618769991513b6 (patch) | |
| tree | 341cb4b2f571f7942e7008d7c32df0d63260692d /src/multimedia/audio/qaudiooutput.cpp | |
| parent | ad698f49d1e2aa8984f4569ebf5c598238fa4691 (diff) | |
| parent | 256ff7bb1551f6c62c4ac861472ea29f45dbab3a (diff) | |
Merge 5.7 into 5.7.1
Change-Id: I72c166fd81e43c5a2a1b17a6e46e12d6c7389fc2
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 585855ace..e96d24dd7 100644 --- a/src/multimedia/audio/qaudiooutput.cpp +++ b/src/multimedia/audio/qaudiooutput.cpp @@ -355,7 +355,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); } /*! |