Remove the mediaChanged() signal from the media player control

The front end has full control over this and handles the signal
emission there.

Change-Id: Icf1b164ce67d1f2036c106461302d53924c03ea1
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

10 files changed, 0 insertions, 16 deletions

diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index 46e82c126..4cc5c4e98 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -103,7 +103,6 @@ public:
 Q_SIGNALS:
     void audioRoleChanged(QAudio::Role role);
     void customAudioRoleChanged(const QString &role);
-    void mediaChanged(const QUrl& content);
     void durationChanged(qint64 duration);
     void positionChanged(qint64 position);
     void stateChanged(QMediaPlayer::State newState);
diff --git a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
index 00f734fb8..d11e2ef14 100644
--- a/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
+++ b/src/multimedia/platform/android/mediaplayer/qandroidmediaplayercontrol.cpp
@@ -426,9 +426,6 @@ void QAndroidMediaPlayerControl::setMedia(const QUrl &mediaContent,
         mMediaPlayer->prepareAsync();
     }
 
-    if (!mReloadingMedia)
-        Q_EMIT mediaChanged(mMediaContent);
-
     resetBufferingProgress();
 
     mReloadingMedia = false;
diff --git a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayercontrol.mm b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayercontrol.mm
index 6929d54d8..bfc667509 100644
--- a/src/multimedia/platform/darwin/mediaplayer/avfmediaplayercontrol.mm
+++ b/src/multimedia/platform/darwin/mediaplayer/avfmediaplayercontrol.mm
@@ -101,9 +101,6 @@ void AVFMediaPlayerControl::setMedia(const QUrl &content, QIODevice *stream)
     const QUrl oldContent = m_session->media();
 
     m_session->setMedia(content, stream);
-
-    if (content != oldContent)
-        Q_EMIT mediaChanged(content);
 }
 
 qint64 AVFMediaPlayerControl::position() const
diff --git a/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
index 785f35b21..ef4161748 100644
--- a/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstreamerplayercontrol.cpp
@@ -363,9 +363,6 @@ void QGstreamerPlayerControl::setMedia(const QUrl &content, QIODevice *stream)
         setBufferProgress(0);
     }
 
-    if (m_currentResource != oldMedia)
-        emit mediaChanged(m_currentResource);
-
     emit positionChanged(position());
 
     popAndNotifyState();
diff --git a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
index c374d97b2..6c622c275 100644
--- a/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
+++ b/src/multimedia/platform/qnx/mediaplayer/mmrenderermediaplayercontrol.cpp
@@ -472,7 +472,6 @@ void MmRendererMediaPlayerControl::setMedia(const QUrl &media, QIODevice *stream
     detach();
 
     m_media = media;
-    emit mediaChanged(m_media);
 
     // Slight hack: With MediaPlayer QtQuick elements that have autoPlay set to true, playback
     // would start before the QtQuick canvas is propagated to all elements, and therefore our
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
index 053e77176..64e73e0ba 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp
+++ b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
@@ -83,7 +83,6 @@ void MFPlayerControl::setMedia(const QUrl &media, QIODevice *stream)
     handleDurationUpdate(-1);
     handleSeekableUpdate(false);
     m_session->load(media, stream);
-    emit mediaChanged(m_media);
 }
 
 void MFPlayerControl::play()
diff --git a/src/multimedia/playback/qmediaplayer.cpp b/src/multimedia/playback/qmediaplayer.cpp
index a4d654fd4..1b3b4faec 100644
--- a/src/multimedia/playback/qmediaplayer.cpp
+++ b/src/multimedia/playback/qmediaplayer.cpp
@@ -271,7 +271,6 @@ QMediaPlayer::QMediaPlayer(QObject *parent):
 
     d->control = d->playerInterface->player();
     Q_ASSERT(d->control);
-    connect(d->control, SIGNAL(mediaChanged(QUrl)), SLOT(_q_handleMediaChanged(QUrl)));
     connect(d->control, SIGNAL(stateChanged(QMediaPlayer::State)), SLOT(_q_stateChanged(QMediaPlayer::State)));
     connect(d->control, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
             SLOT(_q_mediaStatusChanged(QMediaPlayer::MediaStatus)));
diff --git a/tests/auto/unit/mockbackend/mockmediaplayercontrol.h b/tests/auto/unit/mockbackend/mockmediaplayercontrol.h
index 18c843dca..1e7edb92d 100644
--- a/tests/auto/unit/mockbackend/mockmediaplayercontrol.h
+++ b/tests/auto/unit/mockbackend/mockmediaplayercontrol.h
@@ -91,7 +91,6 @@ public:
         if (_state != QMediaPlayer::StoppedState)
             emit stateChanged(_state = QMediaPlayer::StoppedState);
         emit mediaStatusChanged(_mediaStatus);
-        emit mediaChanged(_media = content);
     }
     QIODevice *mediaStream() const { return _stream; }
 
diff --git a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
index 6112dfbe4..30b3eae71 100644
--- a/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
+++ b/tests/auto/unit/qml/qdeclarativeaudio/tst_qdeclarativeaudio.cpp
@@ -153,7 +153,6 @@ public:
                 ? QMediaPlayer::NoMedia
                 : QMediaPlayer::LoadingMedia;
 
-        emit mediaChanged(m_media);
         emit mediaStatusChanged(m_mediaStatus);
     }
 
diff --git a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
index b18b4586d..3bbca7a6b 100644
--- a/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
+++ b/tests/auto/unit/qml/qdeclarativevideo/tst_qdeclarativevideo.cpp
@@ -142,7 +142,6 @@ public:
                 ? QMediaPlayer::NoMedia
                 : QMediaPlayer::LoadingMedia;
 
-        emit mediaChanged(m_media);
         emit mediaStatusChanged(m_mediaStatus);
     }