general api changes, removed unused code

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

6 files changed, 16 insertions, 16 deletions

diff --git a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
index 384769399..11f9fbd4c 100644
--- a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.cpp
@@ -68,15 +68,15 @@ QStringList M3UPlaylistFormat::decode(const QString & contents)
     return QStringList();
 }
 
-QString M3UPlaylistFormat::encode(const QList< SongInfo * > & contents)
+QString M3UPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & contents)
 {
     QStringList out;
     out << QString("#EXTM3U");
-    foreach(SongInfo* f,contents)
+    foreach(AbstractPlaylistItem* f,contents)
     {
         QString info = "#EXTINF:" + QString::number(f->length()) + "," + f->title();
         out.append(info);
-        out.append(f->path());
+        out.append(f->url());
     }
     return out.join("\n");
 }
diff --git a/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h b/src/plugins/PlaylistFormats/m3u/m3uplaylistformat.h
index e19e0e460..91b4d17ad 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/songinfo.h>
+#include <qmmpui/abstractplaylistitem.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<SongInfo*>& contents);
+    virtual QString encode(const QList<AbstractPlaylistItem*>& 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 a505f59cc..10437d7fa 100644
--- a/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/pls/plsplaylistformat.cpp
@@ -81,15 +81,15 @@ QStringList PLSPlaylistFormat::decode(const QString & contents)
     return QStringList();
 }
 
-QString PLSPlaylistFormat::encode(const QList<SongInfo *> & contents)
+QString PLSPlaylistFormat::encode(const QList<AbstractPlaylistItem *> & contents)
 {
     QStringList out;
     out << QString("[playlist]");
     int counter = 1;
-    foreach(SongInfo* f,contents)
+    foreach(AbstractPlaylistItem* f,contents)
     {
         QString begin = "File" + QString::number(counter) + "=";
-        out.append(begin + f->path());
+        out.append(begin + f->url());
         begin = "Title" + QString::number(counter) + "=";
         out.append(begin + f->title());
         begin = "Length" + QString::number(counter) + "=";
diff --git a/src/plugins/PlaylistFormats/pls/plsplaylistformat.h b/src/plugins/PlaylistFormats/pls/plsplaylistformat.h
index ac0de7364..d69901d0d 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/songinfo.h>
+#include <qmmpui/abstractplaylistitem.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<SongInfo*>& contents);
+    virtual QString encode(const QList<AbstractPlaylistItem*>& 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 6e7c9ab5f..8f2cde63d 100644
--- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
+++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp
@@ -67,7 +67,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< SongInfo * > & files)
+QString XSPFPlaylistFormat::encode(const QList<AbstractPlaylistItem*> & files)
 {
     QDomDocument doc;
     QDomElement root = doc.createElement("playlist");
@@ -82,12 +82,12 @@ QString XSPFPlaylistFormat::encode(const QList< SongInfo * > & files)
     QDomElement tracklist = doc.createElement("trackList");
 
     int counter = 1;
-    foreach(SongInfo* f,files)
+    foreach(AbstractPlaylistItem* f,files)
     {
         QDomElement track = doc.createElement("track");
 
         QDomElement ch = doc.createElement("location");
-        QDomText text = doc.createTextNode(/*QString("file://") + */QFileInfo(f->path()).absoluteFilePath());
+        QDomText text = doc.createTextNode(/*QString("file://") + */QFileInfo(f->url()).absoluteFilePath());
         ch.appendChild(text);
         track.appendChild(ch);
 
@@ -102,7 +102,7 @@ QString XSPFPlaylistFormat::encode(const QList< SongInfo * > & files)
         track.appendChild(ch);
 
         ch = doc.createElement("year");
-        text = doc.createTextNode(QString::number(f->year()));
+        text = doc.createTextNode(f->year());
         ch.appendChild(text);
         track.appendChild(ch);
 
diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.h
index 4b25e994f..87c1aad80 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/songinfo.h>
+#include <qmmpui/abstractplaylistitem.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<SongInfo*>& contents);
+    virtual QString encode(const QList<AbstractPlaylistItem*>& contents);
     virtual QString name()const;
 protected:
     QStringList m_supported_formats;