From 1c8ce3f30f8c48b161ae7baa3ad98080ebe954ad Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Tue, 1 Feb 2011 16:41:00 +0000 Subject: cue parser: fixed problem with paths which contains colon git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2032 90c681e8-e032-0410-971d-27865f9a5e38 --- src/plugins/Input/wavpack/cueparser.cpp | 1 + src/plugins/Input/wavpack/decoder_wavpack.cpp | 1 + src/plugins/Input/wavpack/wavpackmetadatamodel.cpp | 1 + 3 files changed, 3 insertions(+) (limited to 'src/plugins/Input/wavpack') diff --git a/src/plugins/Input/wavpack/cueparser.cpp b/src/plugins/Input/wavpack/cueparser.cpp index fcf415e82..39693ba8a 100644 --- a/src/plugins/Input/wavpack/cueparser.cpp +++ b/src/plugins/Input/wavpack/cueparser.cpp @@ -57,6 +57,7 @@ CUEParser::CUEParser(const QByteArray &array, const QString &fileName) 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("wvpack://" + 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/wavpack/decoder_wavpack.cpp b/src/plugins/Input/wavpack/decoder_wavpack.cpp index 071b18004..0c1b2a396 100644 --- a/src/plugins/Input/wavpack/decoder_wavpack.cpp +++ b/src/plugins/Input/wavpack/decoder_wavpack.cpp @@ -71,6 +71,7 @@ bool DecoderWavPack::initialize() p.replace(QString(QUrl::toPercentEncoding("#")), "#"); p.replace(QString(QUrl::toPercentEncoding("?")), "?"); 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; diff --git a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp index ce8a02d84..d5bb27eee 100644 --- a/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp +++ b/src/plugins/Input/wavpack/wavpackmetadatamodel.cpp @@ -30,6 +30,7 @@ WavPackMetaDataModel::WavPackMetaDataModel(const QString &path, QObject *parent) p.replace(QString(QUrl::toPercentEncoding("#")), "#"); p.replace(QString(QUrl::toPercentEncoding("?")), "?"); p.replace(QString(QUrl::toPercentEncoding("%")), "%"); + p.replace(QString(QUrl::toPercentEncoding(":")), ":"); m_path = p; } else -- cgit v1.2.3-13-gbd6f