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

6 files changed, 19 insertions, 19 deletions

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;