From 93e0bbb4f0c3ae83a2700881f244b9d80fbf952b Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 25 Apr 2016 18:57:01 +0000 Subject: 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 --- src/plugins/Input/mad/decodermadfactory.cpp | 8 +------- src/plugins/Input/mad/mpegmetadatamodel.cpp | 4 ++-- src/plugins/Input/mad/replaygainreader.cpp | 4 ++-- 3 files changed, 5 insertions(+), 11 deletions(-) (limited to 'src/plugins/Input/mad') 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(s.utf16())) -#else -#define QStringToFileName(s) s.toLocal8Bit().constData() -#endif - // DecoderMADFactory DecoderMADFactory::DecoderMADFactory() @@ -137,7 +131,7 @@ QList 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()) -- cgit v1.2.3-13-gbd6f