diff options
| author | Lukáš Lalinský <lalinsky@gmail.com> | 2008-11-12 08:17:11 +0000 |
|---|---|---|
| committer | Lukáš Lalinský <lalinsky@gmail.com> | 2008-11-12 08:17:11 +0000 |
| commit | 5df6ef092bfbba0807fa1989476ec54fc2e15c1a (patch) | |
| tree | c61e035fefb0f8e761a2be0827362cad8cc18900 /bindings | |
| parent | fa31fa29d738fbd24857f47a1ac75b11f3a4a986 (diff) | |
Add my old WMA and MP4 code. It is disabled by default, must be explicitly enabled to be compiled.
Scott: If you think this is really a bad idea, please revert.
git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@883108 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'bindings')
| -rw-r--r-- | bindings/c/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | bindings/c/Makefile.am | 2 | ||||
| -rw-r--r-- | bindings/c/tag_c.cpp | 14 | ||||
| -rw-r--r-- | bindings/c/tag_c.h | 4 |
4 files changed, 21 insertions, 1 deletions
diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt index 7dd5a164..3546bbc7 100644 --- a/bindings/c/CMakeLists.txt +++ b/bindings/c/CMakeLists.txt @@ -1,11 +1,13 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/toolkit + ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/asf ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/vorbis ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/flac ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/flac ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpc + ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mp4 ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2 ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex diff --git a/bindings/c/Makefile.am b/bindings/c/Makefile.am index 09e89703..8bb01102 100644 --- a/bindings/c/Makefile.am +++ b/bindings/c/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir)/taglib \ -I$(top_srcdir)/taglib/toolkit \ + -I$(top_srcdir)/taglib/asf \ -I$(top_srcdir)/taglib/mpeg \ -I$(top_srcdir)/taglib/ogg \ -I$(top_srcdir)/taglib/ogg/vorbis \ @@ -8,6 +9,7 @@ INCLUDES = \ -I$(top_srcdir)/taglib/ogg/flac \ -I$(top_srcdir)/taglib/flac \ -I$(top_srcdir)/taglib/mpc \ + -I$(top_srcdir)/taglib/mp4 \ -I$(top_srcdir)/taglib/mpeg/id3v2 \ -I$(top_srcdir)/taglib/wavpack \ -I$(top_srcdir)/taglib/trueaudio \ diff --git a/bindings/c/tag_c.cpp b/bindings/c/tag_c.cpp index 377d92c7..f5f17656 100644 --- a/bindings/c/tag_c.cpp +++ b/bindings/c/tag_c.cpp @@ -19,11 +19,16 @@ * USA * ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "../../config.h" +#endif + #include "tag_c.h" #include <stdlib.h> #include <fileref.h> #include <tfile.h> +#include <asffile.h> #include <vorbisfile.h> #include <mpegfile.h> #include <flacfile.h> @@ -32,6 +37,7 @@ #include <wavpackfile.h> #include <speexfile.h> #include <trueaudiofile.h> +#include <mp4file.h> #include <tag.h> #include <string.h> #include <id3v2framefactory.h> @@ -80,6 +86,14 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type) return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename)); case TagLib_File_TrueAudio: return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename)); +#ifdef WITH_MP4 + case TagLib_File_MP4: + return reinterpret_cast<TagLib_File *>(new MP4::File(filename)); +#endif +#ifdef WITH_ASF + case TagLib_File_ASF: + return reinterpret_cast<TagLib_File *>(new ASF::File(filename)); +#endif } return 0; diff --git a/bindings/c/tag_c.h b/bindings/c/tag_c.h index d70629ec..055da4e3 100644 --- a/bindings/c/tag_c.h +++ b/bindings/c/tag_c.h @@ -89,7 +89,9 @@ typedef enum { TagLib_File_OggFlac, TagLib_File_WavPack, TagLib_File_Speex, - TagLib_File_TrueAudio + TagLib_File_TrueAudio, + TagLib_File_MP4, + TagLib_File_ASF } TagLib_File_Type; /*! |