aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/mpc/decodermpcfactory.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-04-25 06:44:05 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-04-25 06:44:05 +0000
commitbf0735a1b70ff1a6723a728cef32d3eb6ef96902 (patch)
tree3349c9d6b8422ad24613893bf1c1ccd848ae653d /src/plugins/Input/mpc/decodermpcfactory.cpp
parent0a4dd651536e614f3d623108cac870d4ee8635e6 (diff)
downloadqmmp-bf0735a1b70ff1a6723a728cef32d3eb6ef96902.tar.gz
qmmp-bf0735a1b70ff1a6723a728cef32d3eb6ef96902.tar.bz2
qmmp-bf0735a1b70ff1a6723a728cef32d3eb6ef96902.zip
fixed problem with non-latin characters in the file paths under windows
(#852) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6261 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mpc/decodermpcfactory.cpp')
-rw-r--r--src/plugins/Input/mpc/decodermpcfactory.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/Input/mpc/decodermpcfactory.cpp b/src/plugins/Input/mpc/decodermpcfactory.cpp
index 663daa0b2..49a6725e9 100644
--- a/src/plugins/Input/mpc/decodermpcfactory.cpp
+++ b/src/plugins/Input/mpc/decodermpcfactory.cpp
@@ -30,6 +30,12 @@
#include "decoder_mpc.h"
#include "decodermpcfactory.h"
+#ifdef Q_OS_WIN
+#define QStringToFileName(s) TagLib::FileName(reinterpret_cast<const wchar_t *>(s.utf16())
+#else
+#define QStringToFileName(s) s.toLocal8Bit().constData()
+#endif
+
// DecoderMPCFactory
@@ -79,10 +85,10 @@ QList<FileInfo *> DecoderMPCFactory::createPlayList(const QString &fileName, boo
FileInfo *info = new FileInfo(fileName);
#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
- TagLib::FileStream stream(fileName.toLocal8Bit().constData(), true);
+ TagLib::FileStream stream(QStringToFileName(fileName), true);
TagLib::MPC::File fileRef(&stream);
#else
- TagLib::MPC::File fileRef(fileName.toLocal8Bit().constData());
+ TagLib::MPC::File fileRef(QStringToFileName(fileName));
#endif
TagLib::APE::Tag *tag = useMetaData ? fileRef.APETag() : 0;