fixed playing cue files with symbol '#' in the path

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

2 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/Input/wavpack/cueparser.cpp b/src/plugins/Input/wavpack/cueparser.cpp
index 081912dba..db837c427 100644
--- a/src/plugins/Input/wavpack/cueparser.cpp
+++ b/src/plugins/Input/wavpack/cueparser.cpp
@@ -59,7 +59,10 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName)
         }
         else if (words[0] == "TRACK")
         {
-            FileInfo info("wvpack://" + fileName + QString("#%1").arg(words[1].toInt()));
+            QString path = fileName;
+            path.replace("%", QString(QUrl::toPercentEncoding("%"))); //replace special symbols
+            path.replace("#", QString(QUrl::toPercentEncoding("#")));
+            FileInfo info("wvpack://" + path + QString("#%1").arg(words[1].toInt()));
             info.setMetaData(Qmmp::TRACK, words[1].toInt());
             m_infoList << info;
             m_offsets << 0;
diff --git a/src/plugins/Input/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp
index 3260ef5e1..5c13dd075 100644
--- a/src/plugins/Input/wavpack/decoder_wavpack.cpp
+++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp
@@ -130,6 +130,8 @@ bool DecoderWavPack::initialize()
     if (m_path.startsWith("wvpack://")) //embeded cue track
     {
         QString p = QUrl(m_path).path();
+        p.replace(QString(QUrl::toPercentEncoding("#")), "#");
+        p.replace(QString(QUrl::toPercentEncoding("%")), "%");
         m_context = WavpackOpenFileInput (p.toLocal8Bit(), err, OPEN_WVC | OPEN_TAGS, 0);
         int cue_len = WavpackGetTagItem (m_context, "cuesheet", NULL, 0);
         char *value;