mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

Make TAGLIB #if checks backwards compatible

Browse Source
This commit is contained in:
Uwe L. Korn
2014-03-20 19:37:57 +00:00
parent 98656205df
commit c2961edc12
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libtomahawk/filemetadata/MusicScanner.cpp
View File

@@ -142,8 +142,10 @@ MusicScanner::MusicScanner( MusicScanner::ScanMode scanMode, const QStringList&
m_ext2mime.insert( "mp3", TomahawkUtils::extensionToMimetype( "mp3" ) ); m_ext2mime.insert( "mp3", TomahawkUtils::extensionToMimetype( "mp3" ) );
m_ext2mime.insert( "ogg", TomahawkUtils::extensionToMimetype( "ogg" ) ); m_ext2mime.insert( "ogg", TomahawkUtils::extensionToMimetype( "ogg" ) );
m_ext2mime.insert( "oga", TomahawkUtils::extensionToMimetype( "oga" ) ); m_ext2mime.insert( "oga", TomahawkUtils::extensionToMimetype( "oga" ) );
#if defined(TAGLIB_MAJOR_VERSION) && defined(TAGLIB_MINOR_VERSION)
#if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9 #if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
m_ext2mime.insert( "opus", TomahawkUtils::extensionToMimetype( "opus" ) ); m_ext2mime.insert( "opus", TomahawkUtils::extensionToMimetype( "opus" ) );
#endif
#endif #endif
m_ext2mime.insert( "mpc", TomahawkUtils::extensionToMimetype( "mpc" ) ); m_ext2mime.insert( "mpc", TomahawkUtils::extensionToMimetype( "mpc" ) );
m_ext2mime.insert( "wma", TomahawkUtils::extensionToMimetype( "wma" ) ); m_ext2mime.insert( "wma", TomahawkUtils::extensionToMimetype( "wma" ) );

6
src/libtomahawk/filemetadata/taghandlers/tag.cpp
View File

@@ -28,8 +28,10 @@
#include <taglib/xiphcomment.h> #include <taglib/xiphcomment.h>
#include <taglib/vorbisfile.h> #include <taglib/vorbisfile.h>
#include <taglib/oggflacfile.h> #include <taglib/oggflacfile.h>
#if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9 #if defined(TAGLIB_MAJOR_VERSION) && defined(TAGLIB_MINOR_VERSION)
#include <taglib/opusfile.h> #if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
#include <taglib/opusfile.h>
#endif
#endif #endif
#include <taglib/flacfile.h> #include <taglib/flacfile.h>
#include <taglib/speexfile.h> #include <taglib/speexfile.h>

5
src/libtomahawk/utils/TomahawkUtils.cpp
View File

@@ -38,6 +38,9 @@
#include <quazip/quazip.h> #include <quazip/quazip.h>
#include <quazip/quazipfile.h> #include <quazip/quazipfile.h>
// We need this for the version info (if available)
#include <taglib/taglib.h>
#include <QNetworkConfiguration> #include <QNetworkConfiguration>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkProxy> #include <QNetworkProxy>
@@ -322,8 +325,10 @@ extensionToMimetype( const QString& extension )
s_ext2mime.insert( "mp3", "audio/mpeg" ); s_ext2mime.insert( "mp3", "audio/mpeg" );
s_ext2mime.insert( "ogg", "application/ogg" ); s_ext2mime.insert( "ogg", "application/ogg" );
s_ext2mime.insert( "oga", "application/ogg" ); s_ext2mime.insert( "oga", "application/ogg" );
#if defined(TAGLIB_MAJOR_VERSION) && defined(TAGLIB_MINOR_VERSION)
#if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9 #if TAGLIB_MAJOR_VERSION >= 1 && TAGLIB_MINOR_VERSION >= 9
s_ext2mime.insert( "opus", "application/opus" ); s_ext2mime.insert( "opus", "application/opus" );
#endif
#endif #endif
s_ext2mime.insert( "mpc", "audio/x-musepack" ); s_ext2mime.insert( "mpc", "audio/x-musepack" );
s_ext2mime.insert( "wma", "audio/x-ms-wma" ); s_ext2mime.insert( "wma", "audio/x-ms-wma" );