From 1ecf10481569a9d83534d5f71a5045bec74a9783 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 5 Jan 2009 17:59:24 +0000 Subject: fixed xspf parsing git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@737 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp index 8f2cde63d..60a1c27bd 100644 --- a/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp +++ b/src/plugins/PlaylistFormats/xspf/xspfplaylistformat.cpp @@ -57,8 +57,11 @@ QStringList XSPFPlaylistFormat::decode(const QString & contents) while (!child.isNull()) { - QString str = QUrl(child.firstChildElement("location").text()).toString(QUrl::RemoveScheme); - out << str; + QUrl url (child.firstChildElement("location").text()); + if (url.scheme() == "file") //remove scheme for local files only + out << url.toString(QUrl::RemoveScheme); + else + out << url.toString(); child = child.nextSiblingElement(); } @@ -87,7 +90,11 @@ QString XSPFPlaylistFormat::encode(const QList & files) QDomElement track = doc.createElement("track"); QDomElement ch = doc.createElement("location"); - QDomText text = doc.createTextNode(/*QString("file://") + */QFileInfo(f->url()).absoluteFilePath()); + QDomText text; + if (f->url().contains("://")) + text = doc.createTextNode(f->url()); + else //append protocol + text = doc.createTextNode(QString("file://") + QFileInfo(f->url()).absoluteFilePath()); ch.appendChild(text); track.appendChild(ch); -- cgit v1.2.3-13-gbd6f