[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/taglib
From:       Allan Sandfeld Jensen <kde () carewolf ! com>
Date:       2004-07-17 13:39:27
Message-ID: 20040717133927.8C1C19A0A () office ! kde ! org
[Download RAW message or body]

CVS commit by carewolf: 

Add support for reading musepack(mpc)-files and parsing APE-tags(v1 and v2).
Bumb version to have something to check for in JuK and kfile_mpc


  A            mpc/.cvsignore   1.1
  A            mpc/Makefile.am   1.1
  A            mpc/apetag.cpp   1.1 [LGPL (v2.1)]
  A            mpc/apetag.h   1.1 [LGPL (v2.1)]
  A            mpc/mpcfile.cpp   1.1 [LGPL (v2.1)]
  A            mpc/mpcfile.h   1.1 [LGPL (v2.1)]
  A            mpc/mpcproperties.cpp   1.1 [LGPL (v2.1)]
  A            mpc/mpcproperties.h   1.1 [LGPL (v2.1)]
  M +4 -3      Makefile.am   1.28
  M +3 -0      fileref.cpp   1.17
  M +1 -1      toolkit/taglib.h   1.15


--- kdesupport/taglib/toolkit/taglib.h  #1.14:1.15
@@ -24,5 +24,5 @@
 
 #define TAGLIB_MAJOR_VERSION 1
-#define TAGLIB_MINOR_VERSION 1
+#define TAGLIB_MINOR_VERSION 2
 
 #include <string>

--- kdesupport/taglib/Makefile.am  #1.27:1.28
@@ -1,3 +1,3 @@
-SUBDIRS = toolkit mpeg ogg flac
+SUBDIRS = toolkit mpeg ogg flac mpc
 
 INCLUDES = \
@@ -6,4 +6,5 @@
         -I$(top_srcdir)/taglib/ogg \
         -I$(top_srcdir)/taglib/flac \
+        -I$(top_srcdir)/taglib/mpc \
         -I$(top_srcdir)/taglib/ogg/vorbis \
         $(all_includes)
@@ -15,6 +16,6 @@
 taglib_includedir = $(includedir)/taglib
 
-libtag_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:1
-libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la ./flac/libflac.la \
./toolkit/libtoolkit.la  +libtag_la_LDFLAGS = $(all_libraries) -no-undefined \
-version-info 2:1:0 +libtag_la_LIBADD = ./mpeg/libmpeg.la ./ogg/libogg.la \
./flac/libflac.la ./mpc/libmpc.la ./toolkit/libtoolkit.la  
 bin_SCRIPTS = taglib-config

--- kdesupport/taglib/fileref.cpp  #1.16:1.17
@@ -27,4 +27,5 @@
 #include "vorbisfile.h"
 #include "flacfile.h"
+#include "mpcfile.h"
 
 using namespace TagLib;
@@ -130,4 +131,6 @@ File *FileRef::create(const char *fileNa
     if(s.substr(s.size() - 5, 5).upper() == ".FLAC")
       return new FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(s.substr(s.size() - 5, 4).upper() == ".MPC")
+      return new MPC::File(fileName, readAudioProperties, audioPropertiesStyle);
   }
 


[prev in list] [next in list] [prev in thread] [next in thread]