diff options
author | Christian Strømme <christian.stromme@qt.io> | 2017-04-06 17:02:55 +0200 |
---|---|---|
committer | Christian Stromme <christian.stromme@qt.io> | 2017-04-26 14:59:21 +0000 |
commit | 9dbdd5db797fccb8932f49d7380fb5f5eda12cf2 (patch) | |
tree | db133fc3d2172ff5d665970688a98fcd16ecec6a /src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm | |
parent | f97d5eaaa539e2569f3ca3b8eef6649827b07bc1 (diff) |
AVF: Fix mediaplayer state and status issues
This fixes the issues that were causing the whole qmediaplayerbackend
test to be blacklisted on macOS.
Task-number: QTBUG-46368
Change-Id: I59a35dd50a9c07e4e4382c5facb391f5c8a27ee7
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm')
-rw-r--r-- | src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm b/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm index 7f6168dea..5f7bae1c8 100644 --- a/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm +++ b/src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm @@ -97,9 +97,12 @@ const QIODevice *AVFMediaPlayerControl::mediaStream() const void AVFMediaPlayerControl::setMedia(const QMediaContent &content, QIODevice *stream) { + const QMediaContent oldContent = m_session->media(); + m_session->setMedia(content, stream); - Q_EMIT mediaChanged(content); + if (content != oldContent) + Q_EMIT mediaChanged(content); } qint64 AVFMediaPlayerControl::position() const |