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/opus | |
| 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/opus')
| -rw-r--r-- | src/plugins/Input/opus/decoderopusfactory.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/Input/opus/opusmetadatamodel.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/Input/opus/replaygainreader.cpp | 4 |
3 files changed, 5 insertions, 12 deletions
diff --git a/src/plugins/Input/opus/decoderopusfactory.cpp b/src/plugins/Input/opus/decoderopusfactory.cpp index 270c98cb6..126fb222b 100644 --- a/src/plugins/Input/opus/decoderopusfactory.cpp +++ b/src/plugins/Input/opus/decoderopusfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2015 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,13 +26,6 @@ #include "opusmetadatamodel.h" #include "decoderopusfactory.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 - - // DecoderOpusFactory bool DecoderOpusFactory::supports(const QString &source) const { diff --git a/src/plugins/Input/opus/opusmetadatamodel.cpp b/src/plugins/Input/opus/opusmetadatamodel.cpp index b03e26e5b..3e742d1a8 100644 --- a/src/plugins/Input/opus/opusmetadatamodel.cpp +++ b/src/plugins/Input/opus/opusmetadatamodel.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013-2015 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -111,7 +111,7 @@ ulong OpusMetaDataModel::readPictureBlockField(QByteArray data, int offset) VorbisCommentModel::VorbisCommentModel(const QString &path) : TagModel(TagModel::Save) { - m_file = new TagLib::Ogg::Opus::File (path.toLocal8Bit().constData()); + m_file = new TagLib::Ogg::Opus::File (QStringToFileName(path)); m_tag = m_file->tag(); } diff --git a/src/plugins/Input/opus/replaygainreader.cpp b/src/plugins/Input/opus/replaygainreader.cpp index fad3afa57..0f508c302 100644 --- a/src/plugins/Input/opus/replaygainreader.cpp +++ b/src/plugins/Input/opus/replaygainreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -26,7 +26,7 @@ ReplayGainReader::ReplayGainReader(const QString &path) { - TagLib::Ogg::Opus::File fileRef(path.toLocal8Bit ().constData()); + TagLib::Ogg::Opus::File fileRef(QStringToFileName(path)); if(fileRef.tag()) readVorbisComment(fileRef.tag()); } |