Get rid of QMediaContent

There's no need for it without playlist support in QMediaPlayer.
Simply replace it with a QUrl.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/src/multimedia/controls/qmediaplayercontrol.cpp b/src/multimedia/controls/qmediaplayercontrol.cpp
index 75a162a40..a41e67ec5 100644
--- a/src/multimedia/controls/qmediaplayercontrol.cpp
+++ b/src/multimedia/controls/qmediaplayercontrol.cpp
@@ -308,13 +308,13 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::setMedia(const QMediaContent &media, QIODevice *stream)
+    \fn QMediaPlayerControl::setMedia(const QUrl &media, QIODevice *stream)
 
     Sets the current \a media source.  If a \a stream is supplied; data will be read from that
     instead of attempting to resolve the media source.  The media source may still be used to
     supply media information such as mime type.
 
-    Setting the media to a null QMediaContent will cause the control to discard all
+    Setting the media to a null QUrl will cause the control to discard all
     information relating to the current media source and to cease all I/O operations related
     to that media.
 
@@ -325,7 +325,7 @@ QMediaPlayerControl::QMediaPlayerControl(QObject *parent)
 */
 
 /*!
-    \fn QMediaPlayerControl::mediaChanged(const QMediaContent& content)
+    \fn QMediaPlayerControl::mediaChanged(const QUrl& content)
 
     Signals that the current media \a content has changed.
 */
diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h
index 7be0ed9e1..8c4005dc1 100644
--- a/src/multimedia/controls/qmediaplayercontrol.h
+++ b/src/multimedia/controls/qmediaplayercontrol.h
@@ -80,9 +80,9 @@ public:
     virtual qreal playbackRate() const = 0;
     virtual void setPlaybackRate(qreal rate) = 0;
 
-    virtual QMediaContent media() const = 0;
+    virtual QUrl media() const = 0;
     virtual const QIODevice *mediaStream() const = 0;
-    virtual void setMedia(const QMediaContent &media, QIODevice *stream) = 0;
+    virtual void setMedia(const QUrl &media, QIODevice *stream) = 0;
 
     virtual void play() = 0;
     virtual void pause() = 0;
@@ -97,7 +97,7 @@ public:
 Q_SIGNALS:
     void audioRoleChanged(QAudio::Role role);
     void customAudioRoleChanged(const QString &role);
-    void mediaChanged(const QMediaContent& content);
+    void mediaChanged(const QUrl& content);
     void durationChanged(qint64 duration);
     void positionChanged(qint64 position);
     void stateChanged(QMediaPlayer::State newState);