diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/Input/mad/decodermadfactory.cpp | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
copy 1.2 branch to trunk
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/mad/decodermadfactory.cpp')
| -rw-r--r-- | src/plugins/Input/mad/decodermadfactory.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/plugins/Input/mad/decodermadfactory.cpp b/src/plugins/Input/mad/decodermadfactory.cpp index b003eb9b9..96227bd2f 100644 --- a/src/plugins/Input/mad/decodermadfactory.cpp +++ b/src/plugins/Input/mad/decodermadfactory.cpp @@ -20,11 +20,10 @@ #include <QDialog> #include <QMessageBox> -#include <QFile> -#include <QTextCodec> #include <QSettings> #include <QTranslator> -#include <QtPlugin> +#include <QFile> +#include <QTextCodec> #include <mad.h> #include <taglib/tag.h> #include <taglib/fileref.h> @@ -33,9 +32,7 @@ #include <taglib/apetag.h> #include <taglib/tfile.h> #include <taglib/mpegfile.h> -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) #include <taglib/tfilestream.h> -#endif #include "mpegmetadatamodel.h" #include "replaygainreader.h" #include "settingsdialog.h" @@ -142,12 +139,8 @@ QList<FileInfo *> DecoderMADFactory::createPlayList(const QString &fileName, boo FileInfo *info = new FileInfo(fileName); TagLib::Tag *tag = 0; -#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8)) TagLib::FileStream stream(QStringToFileName(fileName), true); TagLib::MPEG::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance()); -#else - TagLib::MPEG::File fileRef(QStringToFileName(fileName)); -#endif if (useMetaData) { @@ -293,5 +286,3 @@ QTranslator *DecoderMADFactory::createTranslator(QObject *parent) translator->load(QString(":/mad_plugin_") + locale); return translator; } - -Q_EXPORT_PLUGIN2(mad, DecoderMADFactory) |