diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-04-25 18:57:01 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-04-25 18:57:01 +0000 |
| commit | 93e0bbb4f0c3ae83a2700881f244b9d80fbf952b (patch) | |
| tree | 9f20cacb64f003282fb8d432291ba2fe286ce8ef /src/plugins/Input/mad | |
| parent | 25e440225c1c5cadfb1f3f7b56f6ebde5b91fe16 (diff) | |
| download | qmmp-93e0bbb4f0c3ae83a2700881f244b9d80fbf952b.tar.gz qmmp-93e0bbb4f0c3ae83a2700881f244b9d80fbf952b.tar.bz2 qmmp-93e0bbb4f0c3ae83a2700881f244b9d80fbf952b.zip | |
fixed QString to TagLib::FileName conversion (#852)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6266 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mad')
| -rw-r--r-- | src/plugins/Input/mad/decodermadfactory.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/Input/mad/mpegmetadatamodel.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/mad/replaygainreader.cpp | 4 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index 095232f94..da570f0f9 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -39,12 +39,6 @@ #include "decoder_mad.h" #include "decodermadfactory.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 - // DecoderMADFactory DecoderMADFactory::DecoderMADFactory() @@ -137,7 +131,7 @@ QList<FileInfo *> DecoderMADFactory::createPlayList(const QString &fileName, boo TagLib::FileStream stream(QStringToFileName(fileName), true); TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance()); #else - TagLib::MPEG::File fileRef(fileName.toLocal8Bit ().constData()); + TagLib::MPEG::File fileRef(QStringToFileName(fileName)); #endif if (useMetaData) diff --git a/src/plugins/Input/mad/mpegmetadatamodel.cpp b/src/plugins/Input/mad/mpegmetadatamodel.cpp index 8979b489e..acfea5b36 100644 --- a/src/plugins/Input/mad/mpegmetadatamodel.cpp +++ b/src/plugins/Input/mad/mpegmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2015 by Ilya Kotov * + * Copyright (C) 2009-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -37,7 +37,7 @@ MPEGMetaDataModel::MPEGMetaDataModel(bool using_rusxmms, const QString &path, QObject *parent) : MetaDataModel(parent) { - m_file = new TagLib::MPEG::File(path.toLocal8Bit().constData()); + m_file = new TagLib::MPEG::File(QStringToFileName(path)); m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::ID3v1); m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::ID3v2); m_tags << new MpegFileTagModel(using_rusxmms, m_file, TagLib::MPEG::File::APE); diff --git a/src/plugins/Input/mad/replaygainreader.cpp b/src/plugins/Input/mad/replaygainreader.cpp index 16f202acc..b8fac3ed4 100644 --- a/src/plugins/Input/mad/replaygainreader.cpp +++ b/src/plugins/Input/mad/replaygainreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2014 by Ilya Kotov * + * Copyright (C) 2009-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -29,7 +29,7 @@ ReplayGainReader::ReplayGainReader(const QString &path) { - TagLib::MPEG::File fileRef(path.toLocal8Bit().constData()); + TagLib::MPEG::File fileRef(QStringToFileName(path)); if(fileRef.ID3v2Tag()) readID3v2(fileRef.ID3v2Tag()); if(m_values.isEmpty() && fileRef.APETag()) |