From 1c8ce3f30f8c48b161ae7baa3ad98080ebe954ad Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
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/flac/cueparser.cpp         | 1 +
 src/plugins/Input/flac/decoder_flac.cpp      | 1 +
 src/plugins/Input/flac/flacmetadatamodel.cpp | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src/plugins/Input/flac')

diff --git a/src/plugins/Input/flac/cueparser.cpp b/src/plugins/Input/flac/cueparser.cpp
index 16f10017d..13623867a 100644
--- a/src/plugins/Input/flac/cueparser.cpp
+++ b/src/plugins/Input/flac/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("flac://" + 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/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index a7335b782..29087e1ae 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -282,6 +282,7 @@ bool DecoderFLAC::initialize()
             p.replace(QString(QUrl::toPercentEncoding("#")), "#");
             p.replace(QString(QUrl::toPercentEncoding("?")), "?");
             p.replace(QString(QUrl::toPercentEncoding("%")), "%");
+            p.replace(QString(QUrl::toPercentEncoding(":")), ":");
             TagLib::FLAC::File fileRef(p.toLocal8Bit ());
             //looking for cuesheet comment
             TagLib::Ogg::XiphComment *xiph_comment = fileRef.xiphComment();
diff --git a/src/plugins/Input/flac/flacmetadatamodel.cpp b/src/plugins/Input/flac/flacmetadatamodel.cpp
index d6617357c..48cd4bc9e 100644
--- a/src/plugins/Input/flac/flacmetadatamodel.cpp
+++ b/src/plugins/Input/flac/flacmetadatamodel.cpp
@@ -37,6 +37,7 @@ FLACMetaDataModel::FLACMetaDataModel(const QString &path, QObject *parent) : Met
         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