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>

3 files changed, 21 insertions, 23 deletions

diff --git a/src/imports/multimedia/qdeclarativeaudio.cpp b/src/imports/multimedia/qdeclarativeaudio.cpp
index aa0c29414..2f98dae60 100644
--- a/src/imports/multimedia/qdeclarativeaudio.cpp
+++ b/src/imports/multimedia/qdeclarativeaudio.cpp
@@ -371,9 +371,8 @@ void QDeclarativeAudio::setSource(const QUrl &url)
         return;
 
     m_source = url;
-    m_content = m_source.isEmpty() ? QMediaContent() : m_source;
     m_loaded = false;
-    if (m_complete && (m_autoLoad || m_content.isNull() || m_autoPlay)) {
+    if (m_complete && (m_autoLoad || m_source.isEmpty() || m_autoPlay)) {
         if (m_error != QMediaPlayer::ServiceMissingError && m_error != QMediaPlayer::NoError) {
             m_error = QMediaPlayer::NoError;
             m_errorString = QString();
@@ -381,7 +380,7 @@ void QDeclarativeAudio::setSource(const QUrl &url)
             emit errorChanged();
         }
 
-        m_player->setMedia(m_content, nullptr);
+        m_player->setMedia(m_source, nullptr);
         m_loaded = true;
     }
     else
@@ -434,7 +433,7 @@ void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
         switch (playbackState){
         case (QMediaPlayer::PlayingState):
             if (!m_loaded) {
-                m_player->setMedia(m_content, nullptr);
+                m_player->setMedia(m_source, nullptr);
                 m_player->setPosition(m_position);
                 m_loaded = true;
             }
@@ -443,7 +442,7 @@ void QDeclarativeAudio::setPlaybackState(QMediaPlayer::State playbackState)
 
         case (QMediaPlayer::PausedState):
             if (!m_loaded) {
-                m_player->setMedia(m_content, nullptr);
+                m_player->setMedia(m_source, nullptr);
                 m_player->setPosition(m_position);
                 m_loaded = true;
             }
@@ -859,8 +858,8 @@ void QDeclarativeAudio::classBegin()
             this, SLOT(_q_statusChanged()));
     connect(m_player, SIGNAL(mediaStatusChanged(QMediaPlayer::MediaStatus)),
             this, SLOT(_q_statusChanged()));
-    connect(m_player, SIGNAL(mediaChanged(const QMediaContent&)),
-            this, SLOT(_q_mediaChanged(const QMediaContent&)));
+    connect(m_player, SIGNAL(mediaChanged(const QUrl&)),
+            this, SLOT(_q_mediaChanged(const QUrl&)));
     connect(m_player, SIGNAL(durationChanged(qint64)),
             this, SIGNAL(durationChanged()));
     connect(m_player, SIGNAL(positionChanged(qint64)),
@@ -913,8 +912,8 @@ void QDeclarativeAudio::componentComplete()
     if (m_notifyInterval != m_player->notifyInterval())
         m_player->setNotifyInterval(m_notifyInterval);
 
-    if (!m_content.isNull() && (m_autoLoad || m_autoPlay)) {
-        m_player->setMedia(m_content, nullptr);
+    if (!m_source.isEmpty() && (m_autoLoad || m_autoPlay)) {
+        m_player->setMedia(m_source, nullptr);
         m_loaded = true;
         if (m_position > 0)
             m_player->setPosition(m_position);
@@ -923,7 +922,7 @@ void QDeclarativeAudio::componentComplete()
     m_complete = true;
 
     if (m_autoPlay) {
-        if (m_content.isNull()) {
+        if (m_source.isEmpty()) {
             m_player->stop();
         } else {
             m_player->play();
@@ -970,7 +969,7 @@ void QDeclarativeAudio::_q_statusChanged()
     }
 }
 
-void QDeclarativeAudio::_q_mediaChanged(const QMediaContent &media)
+void QDeclarativeAudio::_q_mediaChanged(const QUrl &media)
 {
     emit sourceChanged();
 }
diff --git a/src/imports/multimedia/qdeclarativeaudio_p.h b/src/imports/multimedia/qdeclarativeaudio_p.h
index 480a40009..942f2c07e 100644
--- a/src/imports/multimedia/qdeclarativeaudio_p.h
+++ b/src/imports/multimedia/qdeclarativeaudio_p.h
@@ -264,7 +264,7 @@ Q_SIGNALS:
 private Q_SLOTS:
     void _q_error(QMediaPlayer::Error);
     void _q_statusChanged();
-    void _q_mediaChanged(const QMediaContent&);
+    void _q_mediaChanged(const QUrl&);
 
 private:
     Q_DISABLE_COPY(QDeclarativeAudio)
@@ -287,7 +287,6 @@ private:
     QMediaPlayer::Error m_error;
     QString m_errorString;
     QUrl m_source;
-    QMediaContent m_content;
 
     QScopedPointer<QDeclarativeMediaMetaData> m_metaData;
 
diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
index 497e18d7f..8c05a4f30 100644
--- a/src/imports/multimedia/qdeclarativeplaylist.cpp
+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
@@ -231,7 +231,7 @@ void QDeclarativePlaylist::setPlaybackMode(PlaybackMode mode)
  */
 QUrl QDeclarativePlaylist::currentItemSource() const
 {
-    return m_playlist->currentMedia().request().url();
+    return m_playlist->currentMedia();
 }
 
 /*!
@@ -303,7 +303,7 @@ QString QDeclarativePlaylist::errorString() const
 */
 QUrl QDeclarativePlaylist::itemSource(int index)
 {
-    return m_playlist->media(index).request().url();
+    return m_playlist->media(index);
 }
 
 /*!
@@ -407,7 +407,7 @@ bool QDeclarativePlaylist::save(const QUrl &location, const QString &format)
 */
 void QDeclarativePlaylist::addItem(const QUrl &source)
 {
-    m_playlist->addMedia(QMediaContent(source));
+    m_playlist->addMedia(QUrl(source));
 }
 
 /*!
@@ -424,10 +424,10 @@ void QDeclarativePlaylist::addItems(const QList<QUrl> &sources)
     if (sources.isEmpty())
         return;
 
-    QList<QMediaContent> contents;
+    QList<QUrl> contents;
     QList<QUrl>::const_iterator it = sources.constBegin();
     while (it != sources.constEnd()) {
-        contents.push_back(QMediaContent(*it));
+        contents.push_back(QUrl(*it));
         ++it;
     }
     m_playlist->addMedia(contents);
@@ -442,7 +442,7 @@ void QDeclarativePlaylist::addItems(const QList<QUrl> &sources)
 */
 bool QDeclarativePlaylist::insertItem(int index, const QUrl &source)
 {
-    return m_playlist->insertMedia(index, QMediaContent(source));
+    return m_playlist->insertMedia(index, QUrl(source));
 }
 
 /*!
@@ -459,10 +459,10 @@ bool QDeclarativePlaylist::insertItems(int index, const QList<QUrl> &sources)
     if (sources.empty())
         return false;
 
-    QList<QMediaContent> contents;
+    QList<QUrl> contents;
     QList<QUrl>::const_iterator it = sources.constBegin();
     while (it != sources.constEnd()) {
-        contents.push_back(QMediaContent(*it));
+        contents.push_back(QUrl(*it));
         ++it;
     }
     return m_playlist->insertMedia(index, contents);
@@ -535,7 +535,7 @@ QVariant QDeclarativePlaylist::data(const QModelIndex &index, int role) const
     if (!index.isValid())
         return QVariant();
 
-    return m_playlist->media(index.row()).request().url();
+    return m_playlist->media(index.row());
 }
 
 QHash<int, QByteArray> QDeclarativePlaylist::roleNames() const
@@ -553,7 +553,7 @@ void QDeclarativePlaylist::classBegin()
             this, SIGNAL(currentIndexChanged()));
     connect(m_playlist, SIGNAL(playbackModeChanged(QMediaPlaylist::PlaybackMode)),
             this, SIGNAL(playbackModeChanged()));
-    connect(m_playlist, SIGNAL(currentMediaChanged(QMediaContent)),
+    connect(m_playlist, SIGNAL(currentMediaChanged(QUrl)),
             this, SIGNAL(currentItemSourceChanged()));
     connect(m_playlist, SIGNAL(mediaAboutToBeInserted(int,int)),
             this, SLOT(_q_mediaAboutToBeInserted(int,int)));