aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Input/flac/replaygainreader.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2017-11-25 18:00:06 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2017-11-25 18:00:06 +0000
commit8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch)
tree15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/Input/flac/replaygainreader.cpp
parent6fc05db7c6de9a51beba754f12ff4ac32859977d (diff)
downloadqmmp-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/flac/replaygainreader.cpp')
-rw-r--r--src/plugins/Input/flac/replaygainreader.cpp12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/plugins/Input/flac/replaygainreader.cpp b/src/plugins/Input/flac/replaygainreader.cpp
index 023eaf12e..88d57cd13 100644
--- a/src/plugins/Input/flac/replaygainreader.cpp
+++ b/src/plugins/Input/flac/replaygainreader.cpp
@@ -23,34 +23,22 @@
#include <taglib/fileref.h>
#include <taglib/flacfile.h>
#include <taglib/oggflacfile.h>
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
#include <taglib/tfilestream.h>
#include <taglib/id3v2framefactory.h>
-#endif
#include "replaygainreader.h"
ReplayGainReader::ReplayGainReader(const QString &path)
{
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
TagLib::FileStream stream(QStringToFileName(path), true);
-#endif
if(path.endsWith(".flac", Qt::CaseInsensitive))
{
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
TagLib::FLAC::File fileRef(&stream, TagLib::ID3v2::FrameFactory::instance());
-#else
- TagLib::FLAC::File fileRef(QStringToFileName(path));
-#endif
if(fileRef.xiphComment())
readVorbisComment(fileRef.xiphComment());
}
else if(path.endsWith(".oga", Qt::CaseInsensitive))
{
-#if (TAGLIB_MAJOR_VERSION > 1) || ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 8))
TagLib::Ogg::FLAC::File fileRef(&stream);
-#else
- TagLib::Ogg::FLAC::File fileRef(QStringToFileName(path));
-#endif
if(fileRef.tag())
readVorbisComment(fileRef.tag());
}