Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 36723 Details for
Bug 59301
kdemultimedia-3.3.0_beta2 fails to compile with taglib-1.2
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch to work with TagLib 1.2
juk-beta2-taglib.patch (text/plain), 2.32 KB, created by
Scott Wheeler
on 2004-08-03 18:21:24 UTC
(
hide
)
Description:
patch to work with TagLib 1.2
Filename:
MIME Type:
Creator:
Scott Wheeler
Created:
2004-08-03 18:21:24 UTC
Size:
2.32 KB
patch
obsolete
>Index: tag.cpp >=================================================================== >RCS file: /home/kde/kdemultimedia/juk/tag.cpp,v >retrieving revision 1.61 >retrieving revision 1.64 >diff -u -3 -p -r1.61 -r1.64 >--- tag.cpp 18 Jul 2004 12:41:36 -0000 1.61 >+++ tag.cpp 26 Jul 2004 12:53:51 -0000 1.64 >@@ -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 @@ Tag::Tag(const QString &fileName) : > 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 @@ bool Tag::save() > 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 @@ bool Tag::save() > 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();
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 59301
:
36723
|
36830
|
36885