diff options
| author | Lev Zelenskiy <lev.zelenskiy@nokia.com> | 2012-02-06 13:11:10 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-06 06:33:47 +0100 |
| commit | 51ca5582c2475ea91fe2d86793f000f7bed41f51 (patch) | |
| tree | 2a00218178d6e1857540d24fde06afd6c58c360a /src/multimedia/playback | |
| parent | 0d9a5cc5b39db46701af1a6944c8c6f31e75ae6f (diff) | |
QMediaPlayer::setPosition: do not check isSeekable and do not bound by duration
To allow setPosition to be called in stopped state we no longer check
if the player is in seekable state and allow position to be greater than
duration.
Unit test has been updated accordingly.
Change-Id: I29447ffe797a7cc3dcc80d20b2527e9eda493ab6
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
Diffstat (limited to 'src/multimedia/playback')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp index 1542cff0e..5333b7f92 100644 --- a/src/multimedia/playback/qmediaplayer.cpp +++ b/src/multimedia/playback/qmediaplayer.cpp @@ -601,10 +601,10 @@ void QMediaPlayer::setPosition(qint64 position) { Q_D(QMediaPlayer); - if (d->control == 0 || !isSeekable()) + if (d->control == 0) return; - d->control->setPosition(qBound(qint64(0), position, duration())); + d->control->setPosition(qMax(position, 0ll)); } void QMediaPlayer::setVolume(int v) |