From 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Sat, 25 Nov 2017 18:00:06 +0000
Subject: 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
---
 src/plugins/Input/mad/decodermadfactory.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/plugins/Input/mad/decodermadfactory.cpp')

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)
-- 
cgit v1.2.3-13-gbd6f