diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-04 13:36:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-04 13:36:27 +0200 |
| commit | 983bd3ecedf2b1c9fa68ee9cc4edc7d1be59ff37 (patch) | |
| tree | de06f175521d481ebb69e8116d95ea7434aa93ac /src/multimedia/audio | |
| parent | 1a34596b426f8a685453699ad44c45075a6c3681 (diff) | |
| parent | 026aec5079375c866cd88ba176c88d2842d1b260 (diff) | |
| download | qtmultimedia-983bd3ecedf2b1c9fa68ee9cc4edc7d1be59ff37.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp
Change-Id: I4a30fc030c25e7b8da3eb9f386c4a5fa468df141
Diffstat (limited to 'src/multimedia/audio')
| -rw-r--r-- | src/multimedia/audio/qaudioinput.cpp | 3 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput.cpp | 3 | ||||
| -rw-r--r-- | src/multimedia/audio/qsoundeffect.cpp | 6 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index bc6b6215b..07165240b 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -338,7 +338,8 @@ int QAudioInput::notifyInterval() const */ void QAudioInput::setVolume(qreal volume) { - d->setVolume(volume); + qreal v = qBound(qreal(0.0), volume, qreal(1.0)); + d->setVolume(v); } /*! 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); } /*! diff --git a/src/multimedia/audio/qsoundeffect.cpp b/src/multimedia/audio/qsoundeffect.cpp index f653de86e..f7237679b 100644 --- a/src/multimedia/audio/qsoundeffect.cpp +++ b/src/multimedia/audio/qsoundeffect.cpp @@ -279,11 +279,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; |