From 9dbdd5db797fccb8932f49d7380fb5f5eda12cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Str=C3=B8mme?= Date: Thu, 6 Apr 2017 17:02:55 +0200 Subject: 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 --- src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/plugins/avfoundation/mediaplayer/avfmediaplayercontrol.mm') 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 -- cgit v1.2.3