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/flac/decoderflacfactory.cpp | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/plugins/Input/flac/decoderflacfactory.cpp')

diff --git a/src/plugins/Input/flac/decoderflacfactory.cpp b/src/plugins/Input/flac/decoderflacfactory.cpp
index d55623ef2..82332d83c 100644
--- a/src/plugins/Input/flac/decoderflacfactory.cpp
+++ b/src/plugins/Input/flac/decoderflacfactory.cpp
@@ -18,19 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include <QMessageBox>
 #include <QTranslator>
-#include <QtPlugin>
+#include <QMessageBox>
 #include <taglib/tag.h>
 #include <taglib/fileref.h>
 #include <taglib/flacfile.h>
 #include <taglib/oggflacfile.h>
 #include <taglib/xiphcomment.h>
 #include <taglib/tmap.h>
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
 #include <taglib/tfilestream.h>
 #include <taglib/id3v2framefactory.h>
-#endif
 #include "cueparser.h"
 #include "decoder_flac.h"
 #include "flacmetadatamodel.h"
@@ -97,27 +94,17 @@ QList<FileInfo *> DecoderFLACFactory::createPlayList(const QString &fileName, bo
         return QList<FileInfo *>() << info;
     }
 
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
     TagLib::FileStream stream(QStringToFileName(fileName), true);
-#endif
 
     if(fileName.endsWith(".flac", Qt::CaseInsensitive))
     {
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
         flacFile = new TagLib::FLAC::File(&stream, TagLib::ID3v2::FrameFactory::instance());
-#else
-        flacFile = new TagLib::FLAC::File(QStringToFileName(fileName));
-#endif
         tag = useMetaData ? flacFile->xiphComment() : 0;
         ap = flacFile->audioProperties();
     }
     else if(fileName.endsWith(".oga", Qt::CaseInsensitive))
     {
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
         oggFlacFile = new TagLib::Ogg::FLAC::File(&stream);
-#else
-        oggFlacFile = new TagLib::Ogg::FLAC::File(QStringToFileName(fileName));
-#endif
         tag = useMetaData ? oggFlacFile->tag() : 0;
         ap = oggFlacFile->audioProperties();
     }
@@ -208,5 +195,3 @@ QTranslator *DecoderFLACFactory::createTranslator(QObject *parent)
     translator->load(QString(":/flac_plugin_") + locale);
     return translator;
 }
-
-Q_EXPORT_PLUGIN2(flac,DecoderFLACFactory)
-- 
cgit v1.2.3-13-gbd6f