api changes: removed AbstractPlaylistItem class

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1915 90c681e8-e032-0410-971d-27865f9a5e38

12 files changed, 33 insertions, 32 deletions

diff --git a/src/plugins/General/covermanager/covermanager.cpp b/src/plugins/General/covermanager/covermanager.cpp
index 93d2f9af0..5b00b6078 100644
--- a/src/plugins/General/covermanager/covermanager.cpp
+++ b/src/plugins/General/covermanager/covermanager.cpp
@@ -50,7 +50,7 @@ void CoverManager::showWindow()
             pix = QPixmap(":/cm_no_cover.png");
         w->setPixmap(pix);
         MetaDataFormatter formatter("%p%if(%p&%t, - ,)%if(%t,%t,%f)");
-        w->setWindowTitle(formatter.parse(items.at(0)->metaData()));
+        w->setWindowTitle(formatter.parse(items.at(0)));
         w->show();
     }
 }
diff --git a/src/plugins/General/fileops/fileops.cpp b/src/plugins/General/fileops/fileops.cpp
index 1cfe6e6d9..1bea2038a 100644
--- a/src/plugins/General/fileops/fileops.cpp
+++ b/src/plugins/General/fileops/fileops.cpp
@@ -175,7 +175,7 @@ void FileOps::execAction(int n)
             destination = QFileInfo(item->url()).absolutePath ();
             if (file.rename(destination + "/" + fname))
             {
-                item->setMetaData(Qmmp::URL, destination + "/" + fname);
+                item->insert(Qmmp::URL, destination + "/" + fname);
                 model->doCurrentVisibleRequest();
             }
             else
diff --git a/src/plugins/General/hal/halplugin.cpp b/src/plugins/General/hal/halplugin.cpp
index 98c06b2fc..90106b8b0 100644
--- a/src/plugins/General/hal/halplugin.cpp
+++ b/src/plugins/General/hal/halplugin.cpp
@@ -256,7 +256,7 @@ void HalPlugin::removePath(const QString &path)
     int i = 0;
     while (model->count() > 0 && i < model->count())
     {
-        if (model->item(i)->url ().startsWith(path))
+        if (model->item(i)->url().startsWith(path))
             model->removeAt (i);
         else
             ++i;
diff --git a/src/plugins/General/lyrics/lyrics.cpp b/src/plugins/General/lyrics/lyrics.cpp
index 65ab6182a..779f19cf1 100644
--- a/src/plugins/General/lyrics/lyrics.cpp
+++ b/src/plugins/General/lyrics/lyrics.cpp
@@ -47,9 +47,10 @@ void Lyrics::showLyrics()
     QList <PlayListItem *> items = pl_manager->selectedPlayList()->getSelectedItems();
     if (!items.isEmpty())
     {
-        if (items.at(0)->artist().isEmpty() || items.at(0)->title().isEmpty())
+        if (items.at(0)->value(Qmmp::ARTIST).isEmpty() || items.at(0)->value(Qmmp::TITLE).isEmpty())
                 return;
-            LyricsWindow *w = new LyricsWindow(items.at(0)->artist(), items.at(0)->title(), qApp->activeWindow ());
+            LyricsWindow *w = new LyricsWindow(items.at(0)->value(Qmmp::ARTIST),
+                                               items.at(0)->value(Qmmp::TITLE), qApp->activeWindow ());
             w->show();
     }
 }
diff --git a/src/plugins/General/mpris/tracklistobject.cpp b/src/plugins/General/mpris/tracklistobject.cpp
index a7d069c29..56562e8cc 100644
--- a/src/plugins/General/mpris/tracklistobject.cpp
+++ b/src/plugins/General/mpris/tracklistobject.cpp
@@ -86,15 +86,15 @@ QVariantMap TrackListObject::GetMetadata(int in0)
             map.insert("location", "file://" + item->url());
         else
             map.insert("location", item->url());
-        map.insert("title", item->title());
-        map.insert("artist", item->artist());
-        map.insert("album", item->album());
-        map.insert("tracknumber", item->track());
+        map.insert("title", item->value(Qmmp::TITLE));
+        map.insert("artist", item->value(Qmmp::ARTIST));
+        map.insert("album", item->value(Qmmp::ALBUM));
+        map.insert("tracknumber", item->value(Qmmp::TRACK));
         map.insert("time", (quint32)item->length());
         map.insert("mtime", (quint32)item->length() * 1000);
-        map.insert("genre", item->genre());
-        map.insert("comment", item->comment());
-        map.insert("year", item->year().toUInt());
+        map.insert("genre", item->value(Qmmp::GENRE));
+        map.insert("comment", item->value(Qmmp::COMMENT));
+        map.insert("year", item->value(Qmmp::YEAR).toUInt());
     }
     return map;
 }
diff --git a/src/plugins/General/udisks/udisksplugin.cpp b/src/plugins/General/udisks/udisksplugin.cpp
index 19cce37a4..1a1b8d41b 100644
--- a/src/plugins/General/udisks/udisksplugin.cpp
+++ b/src/plugins/General/udisks/udisksplugin.cpp
@@ -248,7 +248,7 @@ void UDisksPlugin::removePath(const QString &path)
     int i = 0;
     while (model->count() > 0 && i < model->count())
     {
-        if (model->item(i)->url ().startsWith(path))
+        if (model->item(i)->url().startsWith(path))
             model->removeAt (i);
         else
             ++i;
diff --git a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
index 18ddc6b01..ce126384a 100644
--- a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
@@ -68,13 +68,13 @@ QStringList M3UPlaylistFormat::decode(const QString & contents)
     return QStringList();
 }
 
-QString M3UPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & contents)
+QString M3UPlaylistFormat::encode(const QList<PlayListItem*> & contents)
 {
     QStringList out;
     out << QString("#EXTM3U");
-    foreach(AbstractPlaylistItem* f,contents)
+    foreach(PlayListItem* f,contents)
     {
-        QString info = "#EXTINF:" + QString::number(f->length()) + "," + f->title();
+        QString info = "#EXTINF:" + QString::number(f->length()) + "," + f->value(Qmmp::TITLE);
         out.append(info);
         out.append(f->url());
     }
diff --git a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
index 91b4d17ad..5a990454c 100644
--- a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
+++ b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QStringList>
 #include <qmmpui/playlistformat.h>
-#include <qmmpui/abstractplaylistitem.h>
+#include <qmmpui/playlistitem.h>
 
 /*!
  * Class for M3U playlist format parsing
@@ -39,7 +39,7 @@ public:
     virtual QStringList getExtensions()const;
     virtual bool hasFormat(const QString&);
     virtual QStringList decode(const QString& contents);
-    virtual QString encode(const QList<AbstractPlaylistItem*>& contents);
+    virtual QString encode(const QList<PlayListItem*>& contents);
     virtual QString name()const;
 protected:
     QStringList m_supported_formats;
diff --git a/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp b/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
index da567db47..8d39eccb6 100644
--- a/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
@@ -81,17 +81,17 @@ QStringList PLSPlaylistFormat::decode(const QString & contents)
     return QStringList();
 }
 
-QString PLSPlaylistFormat::encode(const QList<AbstractPlaylistItem *> & contents)
+QString PLSPlaylistFormat::encode(const QList<PlayListItem *> & contents)
 {
     QStringList out;
     out << QString("[playlist]");
     int counter = 1;
-    foreach(AbstractPlaylistItem* f,contents)
+    foreach(PlayListItem* f,contents)
     {
         QString begin = "File" + QString::number(counter) + "=";
         out.append(begin + f->url());
         begin = "Title" + QString::number(counter) + "=";
-        out.append(begin + f->title());
+        out.append(begin + f->value(Qmmp::TITLE));
         begin = "Length" + QString::number(counter) + "=";
         out.append(begin + QString::number(f->length()));
         counter ++;
diff --git a/src/plugins/PlaylistFormats/pls/plsplaylistformat.h b/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
index d69901d0d..dd97385b5 100644
--- a/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
+++ b/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QStringList>
 #include <qmmpui/playlistformat.h>
-#include <qmmpui/abstractplaylistitem.h>
+#include <qmmpui/playlistitem.h>
 
 /*!
  * Class for PLS playlist format parsing
@@ -39,7 +39,7 @@ public:
     virtual QStringList getExtensions()const;
     virtual bool hasFormat(const QString&);
     virtual QStringList decode(const QString& contents);
-    virtual QString encode(const QList<AbstractPlaylistItem*>& contents);
+    virtual QString encode(const QList<PlayListItem*>& contents);
     virtual QString name()const;
 protected:
     QStringList m_supported_formats;
diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
index 9b5612fab..ad6c8f2a6 100644
--- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
@@ -68,7 +68,7 @@ QStringList XSPFPlaylistFormat::decode(const QString & contents)
 
 // Needs more work - it's better use libSpiff there and put it as plugin.
 
-QString XSPFPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & files)
+QString XSPFPlaylistFormat::encode(const QList<PlayListItem*> & files)
 {
     QDomDocument doc;
     QDomElement root = doc.createElement("playlist");
@@ -83,7 +83,7 @@ QString XSPFPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & files)
     QDomElement tracklist = doc.createElement("trackList");
 
     int counter = 1;
-    foreach(AbstractPlaylistItem* f,files)
+    foreach(PlayListItem* f,files)
     {
         QDomElement track = doc.createElement("track");
 
@@ -98,22 +98,22 @@ QString XSPFPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & files)
         track.appendChild(ch);
 
         ch = doc.createElement("title");
-        text = doc.createTextNode(f->title());
+        text = doc.createTextNode(f->value(Qmmp::TITLE));
         ch.appendChild(text);
         track.appendChild(ch);
 
         ch = doc.createElement("creator");
-        text = doc.createTextNode(f->artist());
+        text = doc.createTextNode(f->value(Qmmp::ARTIST));
         ch.appendChild(text);
         track.appendChild(ch);
 
         ch = doc.createElement("annotation");
-        text = doc.createTextNode(f->comment());
+        text = doc.createTextNode(f->value(Qmmp::COMMENT));
         ch.appendChild(text);
         track.appendChild(ch);
 
         ch = doc.createElement("album");
-        text = doc.createTextNode(f->album());
+        text = doc.createTextNode(f->value(Qmmp::ALBUM));
         ch.appendChild(text);
         track.appendChild(ch);
 
@@ -124,7 +124,7 @@ QString XSPFPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & files)
 
         ch = doc.createElement("meta");
         ch.setAttribute("rel", "year");
-        text = doc.createTextNode(f->year());
+        text = doc.createTextNode(f->value(Qmmp::YEAR));
         ch.appendChild(text);
         track.appendChild(ch);
 
diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
index 87c1aad80..922cc5abf 100644
--- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
+++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
@@ -24,7 +24,7 @@
 #include <QString>
 #include <QStringList>
 #include <qmmpui/playlistformat.h>
-#include <qmmpui/abstractplaylistitem.h>
+#include <qmmpui/playlistitem.h>
 
 /*!
  * Class for XSPF playlist format parsing
@@ -39,7 +39,7 @@ public:
     virtual QStringList getExtensions()const;
     virtual bool hasFormat(const QString&);
     virtual QStringList decode(const QString& contents);
-    virtual QString encode(const QList<AbstractPlaylistItem*>& contents);
+    virtual QString encode(const QList<PlayListItem*>& contents);
     virtual QString name()const;
 protected:
     QStringList m_supported_formats;