diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:09:08 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-21 11:09:08 +0200 |
| commit | 1fd79bfd906de6e630f813417fced24cfca97f4b (patch) | |
| tree | 3f2c970c162b127d518800381bde96cf1e982145 /src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp | |
| parent | 684456d8fbdb80d621e3c4838544c2878e3f2a43 (diff) | |
| parent | 021e8989308fba30425e7a0f34f4e176a8aa3ccf (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I06cd631ca9d3b6b2ed5709a7697a26b9eb7171d1
Diffstat (limited to 'src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp')
| -rw-r--r-- | src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp index 54b31627e..0bfe76f2f 100644 --- a/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp +++ b/src/plugins/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp @@ -119,6 +119,9 @@ QMediaPlayerResourceSetInterface* QGstreamerPlayerControl::resources() const qint64 QGstreamerPlayerControl::position() const { + if (m_mediaStatus == QMediaPlayer::EndOfMedia) + return m_session->duration(); + return m_pendingSeekPosition != -1 ? m_pendingSeekPosition : m_session->position(); } |