[patch] 3.3.0_beta2-juk-taglib.patch

3.3.0_beta2-juk-taglib.patch (text/plain), 2.19 KB, created by Patrick Dawson (RETIRED) on 2004-08-05 11:12:09 UTC

diff -ur kdemultimedia-3.2.92.orig/juk/tag.cpp kdemultimedia-3.2.92/juk/tag.cpp
--- kdemultimedia-3.2.92.orig/juk/tag.cpp	2004-08-05 14:03:48.368890936 -0400
+++ kdemultimedia-3.2.92/juk/tag.cpp	2004-08-05 14:04:05.051354816 -0400
@@ -25,11 +25,15 @@
 #include <taglib/xiphcomment.h>
 #include <taglib/id3v2framefactory.h>
 
-#if (TAGLIB_MAJOR_VERSION>1) ||  \
-   ((TAGLIB_MAJOR_VERSION==1) && (TAGLIB_MINOR_VERSION>=2))
-#include <taglib/mpcfile.h>
+#if (TAGLIB_MAJOR_VERSION > 1) || \
+      ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 2))
 #include <taglib/oggflacfile.h>
-#define TAGLIB_12
+#define TAGLIB_1_2
+#endif
+#if (TAGLIB_MAJOR_VERSION > 1) || \
+    ((TAGLIB_MAJOR_VERSION == 1) && (TAGLIB_MINOR_VERSION >= 3))
+#include <taglib/mpcfile.h>
+#define TAGLIB_1_3
 #endif
 
 #include "cache.h"
@@ -61,15 +65,16 @@
         if(file.isOpen())
 	    setup(&file);
     }
-#ifdef TAGLIB_12
+#ifdef TAGLIB_1_3
     else if(MediaFiles::isMPC(fileName)) {
 	kdDebug(65432) << "Trying to resolve Musepack file" << endl;
         TagLib::MPC::File file(QFile::encodeName(fileName).data());
         if(file.isOpen())
             setup(&file);
     }
+#endif
+#ifdef TAGLIB_1_2
     else if(MediaFiles::isOggFLAC(fileName)) {
-	kdDebug(65432) << "Trying to resolve Ogg/FLAC file" << endl;
         TagLib::Ogg::FLAC::File file(QFile::encodeName(fileName).data());
         if(file.isOpen())
             setup(&file);
@@ -98,9 +103,11 @@
         file = new TagLib::MPEG::File(QFile::encodeName(m_fileName).data());
     else if(MediaFiles::isFLAC(m_fileName))
         file = new TagLib::FLAC::File(QFile::encodeName(m_fileName).data());
-#ifdef TAGLIB_12
+#ifdef TAGLIB_1_3
     else if(MediaFiles::isMPC(m_fileName))
         file = new TagLib::MPC::File(QFile::encodeName(m_fileName).data());
+#endif
+#ifdef TAGLIB_1_2
     else if(MediaFiles::isOggFLAC(m_fileName))
         file = new TagLib::Ogg::FLAC::File(QFile::encodeName(m_fileName).data());
 #endif
@@ -115,7 +122,7 @@
         file->tag()->setComment(QStringToTString(m_comment));
         file->tag()->setTrack(m_track);
         file->tag()->setYear(m_year);
-#ifdef TAGLIB_12
+#ifdef TAGLIB_1_2
         result = file->save();
 #else
         file->save();