Clean up playlist handling

Remove the whole plugin infrastructure and all the complexity
that came with it and some other architectural decisions.

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

2 files changed, 11 insertions, 33 deletions

diff --git a/src/imports/multimedia/qdeclarativeplaylist.cpp b/src/imports/multimedia/qdeclarativeplaylist.cpp
index 400e23467..29900730c 100644
--- a/src/imports/multimedia/qdeclarativeplaylist.cpp
+++ b/src/imports/multimedia/qdeclarativeplaylist.cpp
@@ -182,7 +182,6 @@ QDeclarativePlaylist::QDeclarativePlaylist(QObject *parent)
     : QAbstractListModel(parent)
     , m_playlist(0)
     , m_error(QMediaPlaylist::NoError)
-    , m_readOnly(false)
 {
 }
 
@@ -264,18 +263,6 @@ int QDeclarativePlaylist::itemCount() const
 }
 
 /*!
-    \qmlproperty bool QtMultimedia::Playlist::readOnly
-
-    This property indicates if the playlist can be modified.
- */
-bool QDeclarativePlaylist::readOnly() const
-{
-    // There's no signal to tell whether or not the read only state changed, so we consider it fixed
-    // after its initial retrieval in componentComplete().
-    return m_readOnly;
-}
-
-/*!
     \qmlproperty enumeration QtMultimedia::Playlist::error
 
     This property holds the error condition of the playlist.
@@ -418,9 +405,9 @@ bool QDeclarativePlaylist::save(const QUrl &location, const QString &format)
 
     Returns true if the \a source is added successfully.
 */
-bool QDeclarativePlaylist::addItem(const QUrl &source)
+void QDeclarativePlaylist::addItem(const QUrl &source)
 {
-    return m_playlist->addMedia(QMediaContent(source));
+    m_playlist->addMedia(QMediaContent(source));
 }
 
 /*!
@@ -432,10 +419,10 @@ bool QDeclarativePlaylist::addItem(const QUrl &source)
 
     \since 5.7
 */
-bool QDeclarativePlaylist::addItems(const QList<QUrl> &sources)
+void QDeclarativePlaylist::addItems(const QList<QUrl> &sources)
 {
     if (sources.isEmpty())
-        return false;
+        return;
 
     QList<QMediaContent> contents;
     QList<QUrl>::const_iterator it = sources.constBegin();
@@ -443,7 +430,7 @@ bool QDeclarativePlaylist::addItems(const QList<QUrl> &sources)
         contents.push_back(QMediaContent(*it));
         ++it;
     }
-    return m_playlist->addMedia(contents);
+    m_playlist->addMedia(contents);
 }
 
 /*!
@@ -528,9 +515,9 @@ bool QDeclarativePlaylist::removeItems(int start, int end)
 
     Returns \c true if the operation is successful.
 */
-bool QDeclarativePlaylist::clear()
+void QDeclarativePlaylist::clear()
 {
-    return m_playlist->clear();
+    m_playlist->clear();
 }
 
 int QDeclarativePlaylist::rowCount(const QModelIndex &parent) const
@@ -582,11 +569,6 @@ void QDeclarativePlaylist::classBegin()
             this, SIGNAL(loaded()));
     connect(m_playlist, SIGNAL(loadFailed()),
             this, SLOT(_q_loadFailed()));
-
-    if (m_playlist->isReadOnly()) {
-        m_readOnly = true;
-        emit readOnlyChanged();
-    }
 }
 
 void QDeclarativePlaylist::componentComplete()
diff --git a/src/imports/multimedia/qdeclarativeplaylist_p.h b/src/imports/multimedia/qdeclarativeplaylist_p.h
index d086f26b5..8c3cce300 100644
--- a/src/imports/multimedia/qdeclarativeplaylist_p.h
+++ b/src/imports/multimedia/qdeclarativeplaylist_p.h
@@ -81,7 +81,6 @@ class QDeclarativePlaylist : public QAbstractListModel, public QQmlParserStatus
     Q_PROPERTY(QUrl currentItemSource READ currentItemSource NOTIFY currentItemSourceChanged)
     Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged)
     Q_PROPERTY(int itemCount READ itemCount NOTIFY itemCountChanged)
-    Q_PROPERTY(bool readOnly READ readOnly NOTIFY readOnlyChanged)
     Q_PROPERTY(Error error READ error NOTIFY errorChanged)
     Q_PROPERTY(QString errorString READ errorString NOTIFY errorChanged)
     Q_PROPERTY(QQmlListProperty<QDeclarativePlaylistItem> items READ items DESIGNABLE false)
@@ -97,7 +96,7 @@ public:
         CurrentItemInLoop = QMediaPlaylist::CurrentItemInLoop,
         Sequential = QMediaPlaylist::Sequential,
         Loop = QMediaPlaylist::Loop,
-        Random = QMediaPlaylist::Random
+//        Random = QMediaPlaylist::Random
     };
     enum Error
     {
@@ -121,7 +120,6 @@ public:
     int currentIndex() const;
     void setCurrentIndex(int currentIndex);
     int itemCount() const;
-    bool readOnly() const;
     Error error() const;
     QString errorString() const;
     QMediaPlaylist *mediaPlaylist() const { return m_playlist; }
@@ -157,21 +155,20 @@ public Q_SLOTS:
     void shuffle();
     void load(const QUrl &location, const QString &format = QString());
     bool save(const QUrl &location, const QString &format = QString());
-    bool addItem(const QUrl &source);
-    Q_REVISION(1) bool addItems(const QList<QUrl> &sources);
+    void addItem(const QUrl &source);
+    Q_REVISION(1) void addItems(const QList<QUrl> &sources);
     bool insertItem(int index, const QUrl &source);
     Q_REVISION(1) bool insertItems(int index, const QList<QUrl> &sources);
     Q_REVISION(1) bool moveItem(int from, int to);
     bool removeItem(int index);
     Q_REVISION(1) bool removeItems(int start, int end);
-    bool clear();
+    void clear();
 
 Q_SIGNALS:
     void playbackModeChanged();
     void currentItemSourceChanged();
     void currentIndexChanged();
     void itemCountChanged();
-    void readOnlyChanged();
     void errorChanged();
 
     void itemAboutToBeInserted(int start, int end);
@@ -198,7 +195,6 @@ private:
     QMediaPlaylist *m_playlist;
     QString m_errorString;
     QMediaPlaylist::Error m_error;
-    bool m_readOnly;
 };
 
 QT_END_NAMESPACE