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/vorbis/decodervorbisfactory.cpp | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/plugins/Input/vorbis/decodervorbisfactory.cpp')

diff --git a/src/plugins/Input/vorbis/decodervorbisfactory.cpp b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
index f921c451e..717be4795 100644
--- a/src/plugins/Input/vorbis/decodervorbisfactory.cpp
+++ b/src/plugins/Input/vorbis/decodervorbisfactory.cpp
@@ -20,13 +20,10 @@
 
 #include <QMessageBox>
 #include <QTranslator>
-#include <QtPlugin>
 #include <taglib/tag.h>
 #include <taglib/fileref.h>
 #include <taglib/vorbisfile.h>
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
 #include <taglib/tfilestream.h>
-#endif
 #include "replaygainreader.h"
 #include "decoder_vorbis.h"
 #include "vorbismetadatamodel.h"
@@ -77,12 +74,8 @@ QList<FileInfo *> DecoderVorbisFactory::createPlayList(const QString &fileName,
 {
     FileInfo *info = new FileInfo(fileName);
 
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
     TagLib::FileStream stream(QStringToFileName(fileName), true);
     TagLib::Ogg::Vorbis::File fileRef(&stream);
-#else
-    TagLib::Ogg::Vorbis::File fileRef(QStringToFileName(fileName));
-#endif
     TagLib::Ogg::XiphComment *tag = useMetaData ? fileRef.tag() : 0;
 
     if (tag && !tag->isEmpty())
@@ -142,5 +135,3 @@ QTranslator *DecoderVorbisFactory::createTranslator(QObject *parent)
     translator->load(QString(":/vorbis_plugin_") + locale);
     return translator;
 }
-
-Q_EXPORT_PLUGIN2(vorbis,DecoderVorbisFactory)
-- 
cgit v1.2.3-13-gbd6f