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 | |
parent | 1c6c85cd7c619cc15c099ae63a5d22bcf661847c (diff) | |
parent | c7433f84288a33d6a5ea411dabf1618afcacfaf1 (diff) | |
download | qtmultimedia-030e19816a8933a8c6c0a4d8193251446d4ee514.tar.gz |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I126bc73db5b5d9b6c26cb9ff5da7ed13a16b378b
Diffstat (limited to 'src/multimedia')
-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 | ||||
-rw-r--r-- | src/multimedia/controls/qmediarecordercontrol.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/playback/qmedianetworkplaylistprovider.cpp | 2 | ||||
-rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 4 | ||||
-rw-r--r-- | src/multimedia/recording/qmediarecorder.cpp | 4 |
7 files changed, 12 insertions, 12 deletions
diff --git a/src/multimedia/audio/qaudioinput.cpp b/src/multimedia/audio/qaudioinput.cpp index ad54521fa..872dce819 100644 --- a/src/multimedia/audio/qaudioinput.cpp +++ b/src/multimedia/audio/qaudioinput.cpp @@ -343,7 +343,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 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); } /*! 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; diff --git a/src/multimedia/controls/qmediarecordercontrol.cpp b/src/multimedia/controls/qmediarecordercontrol.cpp index 611f1fdcc..e4667d369 100644 --- a/src/multimedia/controls/qmediarecordercontrol.cpp +++ b/src/multimedia/controls/qmediarecordercontrol.cpp @@ -164,7 +164,7 @@ QMediaRecorderControl::~QMediaRecorderControl() */ /*! - \fn void QMediaRecorderControl::setVolume(qreal gain) + \fn void QMediaRecorderControl::setVolume(qreal volume) Sets the audio \a volume of a media recorder control. diff --git a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp index 67ce123d8..7de90d9a1 100644 --- a/src/multimedia/playback/qmedianetworkplaylistprovider.cpp +++ b/src/multimedia/playback/qmedianetworkplaylistprovider.cpp @@ -74,7 +74,7 @@ void QMediaNetworkPlaylistProviderPrivate::_q_handleParserError(QPlaylistFilePar QMediaPlaylist::Error playlistError = QMediaPlaylist::NoError; - switch ((QPlaylistFileParser::ParserError)err) { + switch (err) { case QPlaylistFileParser::NoError: return; case QPlaylistFileParser::FormatError: diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 648c13220..191095e82 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -962,8 +962,8 @@ void QMediaPlayer::setPlaybackRate(qreal rate) Sets the current \a media source. If a \a stream is supplied; media data will be read from it instead of resolving the media - source. In this case the media source may still be used to resolve additional information - about the media such as mime type. + source. In this case the media source may still be used to resolve additional information + about the media such as mime type. The \a stream must be open and readable. Setting the media to a null QMediaContent will cause the player to discard all information relating to the current media source and to cease all I/O operations related diff --git a/src/multimedia/recording/qmediarecorder.cpp b/src/multimedia/recording/qmediarecorder.cpp index 7b0234988..d3962b78f 100644 --- a/src/multimedia/recording/qmediarecorder.cpp +++ b/src/multimedia/recording/qmediarecorder.cpp @@ -578,8 +578,10 @@ void QMediaRecorder::setVolume(qreal volume) { Q_D(QMediaRecorder); - if (d->control) + if (d->control) { + volume = qMax(qreal(0.0), volume); d->control->setVolume(volume); + } } /*! |