aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/cue
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-01-28 17:49:54 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2012-01-28 17:49:54 +0000
commitbb38383b4d6b0f88fa77fb919d6adbf7a75f5234 (patch)
tree5284842ffac36ee430736e67b74bb18d35942e3e /src/plugins/Input/cue
parentc78b8d1b6da1802559bfaa55a6476f2dfdd1229a (diff)
downloadqmmp-bb38383b4d6b0f88fa77fb919d6adbf7a75f5234.tar.gz
qmmp-bb38383b4d6b0f88fa77fb919d6adbf7a75f5234.tar.bz2
qmmp-bb38383b4d6b0f88fa77fb919d6adbf7a75f5234.zip
cue plugin: fixed windows support
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2570 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/cue')
-rw-r--r--src/plugins/Input/cue/cueparser.cpp16
-rw-r--r--src/plugins/Input/cue/cueparser.h1
2 files changed, 7 insertions, 10 deletions
diff --git a/src/plugins/Input/cue/cueparser.cpp b/src/plugins/Input/cue/cueparser.cpp
index 3a3aa3a71..9e6ba67d9 100644
--- a/src/plugins/Input/cue/cueparser.cpp
+++ b/src/plugins/Input/cue/cueparser.cpp
@@ -36,11 +36,9 @@ CUEParser::CUEParser(const QString &url)
QString fileName = url;
if(url.contains("://"))
{
- QString p = QUrl(url).path();
- p.replace(QString(QUrl::toPercentEncoding("#")), "#");
- p.replace(QString(QUrl::toPercentEncoding("?")), "?");
- p.replace(QString(QUrl::toPercentEncoding("%")), "%");
- p.replace(QString(QUrl::toPercentEncoding(":")), ":");
+ QString p = fileName;
+ p.remove("cue://");
+ p.remove(QRegExp("#\\d+$"));
fileName = p;
}
QFile file(fileName);
@@ -122,10 +120,10 @@ CUEParser::CUEParser(const QString &url)
else if (words[0] == "TRACK")
{
QString path = fileName;
- path.replace("%", QString(QUrl::toPercentEncoding("%"))); //replace special symbols
- path.replace("#", QString(QUrl::toPercentEncoding("#")));
- path.replace("?", QString(QUrl::toPercentEncoding("?")));
- path.replace(":", QString(QUrl::toPercentEncoding(":")));
+ //path.replace("%", QString(QUrl::toPercentEncoding("%"))); //replace special symbols
+ //path.replace("#", QString(QUrl::toPercentEncoding("#")));
+ //path.replace("?", QString(QUrl::toPercentEncoding("?")));
+ //path.replace(":", QString(QUrl::toPercentEncoding(":")));
FileInfo info("cue://" + path + QString("#%1").arg(words[1].toInt()));
info.setMetaData(Qmmp::TRACK, words[1].toInt());
info.setMetaData(Qmmp::ALBUM, album);
diff --git a/src/plugins/Input/cue/cueparser.h b/src/plugins/Input/cue/cueparser.h
index 53b33c685..c4ecf2427 100644
--- a/src/plugins/Input/cue/cueparser.h
+++ b/src/plugins/Input/cue/cueparser.h
@@ -24,7 +24,6 @@
#include <QMap>
#include <QString>
#include <QStringList>
-#include <QUrl>
#include <qmmp/qmmp.h>
#include <qmmp/fileinfo.h>