Add unit tests

Merge remote branch 'HessiJames/master'
String to number conversion moved to new function - long readNumber(ByteVector vector)
2026-06-07 06:50:32 -04:00 · 2011-07-14 14:13:24 +02:00 · 2011-07-14 13:40:33 +02:00 · 2011-07-07 17:57:22 +02:00 · 2011-07-05 17:24:59 +02:00 · 2011-06-28 02:55:03 +02:00
232 changed files with 6724 additions and 1168 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,41 @@
+cmake_install.cmake
+Makefile
+CMakeFiles/
+*.so
+*.so.*
+*.dylib
+*.vcproj
+*.ncb
+*.sln
+*.suo
+*.user
+.*
+*~
+/CMakeCache.txt
+/Doxyfile
+/config.h
+/taglib.pc
+/tests/test_runner
+/taglib_config.h
+/taglib-config
+/bindings/c/taglib_c.pc
+/bindings/c/Debug
+/bindings/c/MinSizeRel
+/bindings/c/Release
+/bindings/c/tag_c.dir/Debug
+/bindings/c/tag_c.dir/MinSizeRel
+/bindings/c/tag_c.dir/Release
+/examples/framelist
+/examples/strip-id3v1
+/examples/tagreader
+/examples/tagreader_c
+/examples/tagwriter
+/doc/html
+/taglib/Debug
+/taglib/MinSizeRel
+/taglib/Release
+/taglib/tag.dir/Debug
+/taglib/tag.dir/MinSizeRel
+/taglib/tag.dir/Release
+/ALL_BUILD.dir
+/ZERO_CHECK.dir
--- a/4
+++ b/4
@@ -1,11 +1,15 @@
 Scott Wheeler <wheeler@kde.org>
 Author, maintainer
+Lukas Lalinsky <lalinsky@gmail.com>
+ Implementation of multiple new file formats, many bug fixes, maintainer
 Ismael Orenstein <orenstein@kde.org>
 Xing header implementation
 Allan Sandfeld Jensen <kde@carewolf.org>
 FLAC metadata implementation
 Teemu Tervo <teemu.tervo@gmx.net>
 Numerous bug reports and fixes
+Mathias Panzenböck <grosser.meister.morti@gmx.net>
+ Mod, S3M, IT and XM metadata implementations

 Please send all patches and questions to taglib-devel@kde.org rather than to
 individual developers!
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,81 +2,93 @@ project(taglib)

 cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)

-OPTION(ENABLE_STATIC "Make static version of libtag"  OFF)
+option(ENABLE_STATIC "Make static version of libtag"  OFF)
+if(ENABLE_STATIC)
+  add_definitions(-DTAGLIB_STATIC)
+  set(BUILD_SHARED_LIBS OFF)
+else()
+  set(BUILD_SHARED_LIBS ON)
+endif()

-OPTION(BUILD_TESTS "Build the test suite"  OFF)
-OPTION(BUILD_EXAMPLES "Build the examples"  OFF)
+option(BUILD_TESTS "Build the test suite"  OFF)
+option(BUILD_EXAMPLES "Build the examples"  OFF)

-OPTION(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
-OPTION(WITH_ASF "Enable ASF tag reading/writing code"  OFF)
-OPTION(WITH_MP4 "Enable MP4 tag reading/writing code"  OFF)
+option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)

 add_definitions(-DHAVE_CONFIG_H)
+set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")

-#add some KDE specific stuff
-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
-set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}       CACHE PATH  "Base directory for executables and libraries" FORCE)
-#
 ## the following are directories where stuff will be installed to
-set(BIN_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/bin"    CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)" FORCE)
-set(LIB_INSTALL_DIR          "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"     CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
-set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include"             CACHE PATH "The subdirectory to the header prefix" FORCE)
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+set(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Base directory for executables and libraries" FORCE)
+set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)" FORCE)
+set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix" FORCE)

-if (CMAKE_COMPILER_IS_GNUCXX)
-   if (CMAKE_SYSTEM_NAME MATCHES Linux)
-     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
-     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
-   endif (CMAKE_SYSTEM_NAME MATCHES Linux)
-endif (CMAKE_COMPILER_IS_GNUCXX)
-if(MSVC)
-  if (MSVC_VERSION GREATER 1399)
-    # If using Visual C++ 2005 (MSVC80) and greater (MSVC_VERSION=1400)
-    add_definitions(/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /Zc:wchar_t-)
-  endif (MSVC_VERSION GREATER 1399)
-endif(MSVC)
-if (WIN32)
-  set(CMAKE_DEBUG_POSTFIX "d")
-endif (WIN32)
+if(APPLE)
+	option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
+	set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to.")
+endif()

-SET(TAGLIB_LIB_MAJOR_VERSION "1")
-SET(TAGLIB_LIB_MINOR_VERSION "7")
-SET(TAGLIB_LIB_PATCH_VERSION "0")
+if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
+endif()

-SET(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
+set(TAGLIB_LIB_MAJOR_VERSION "1")
+set(TAGLIB_LIB_MINOR_VERSION "7")
+set(TAGLIB_LIB_PATCH_VERSION "0")

+set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
+
+# 1. If the library source code has changed at all since the last update, then increment revision.
+# 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
+# 3. If any interfaces have been added since the last public release, then increment age.
+# 4. If any interfaces have been removed since the last public release, then set age to 0. 
+set(TAGLIB_SOVERSION_CURRENT  11)
+set(TAGLIB_SOVERSION_REVISION 0)
+set(TAGLIB_SOVERSION_AGE      10)
+
+math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
+math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
+math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")

 include(ConfigureChecks.cmake)

 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config )
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})

-if(NOT WIN32)
+if(NOT WIN32 AND NOT BUILD_FRAMEWORK)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc )
-endif(NOT WIN32)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+endif()
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
+configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)

 if(WITH_ASF)
    set(TAGLIB_WITH_ASF TRUE)
-endif(WITH_ASF)
+endif()
 if(WITH_MP4)
    set(TAGLIB_WITH_MP4 TRUE)
-endif(WITH_MP4)
-configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h )
-install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
+endif()

-ADD_SUBDIRECTORY( taglib ) 
+configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)

-ADD_SUBDIRECTORY(tests)
-ADD_SUBDIRECTORY(examples)
+add_subdirectory(taglib) 
+add_subdirectory(bindings)
+add_subdirectory(tests)
+add_subdirectory(examples)

-ADD_SUBDIRECTORY(bindings)
-if(NOT WIN32)
-  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
-endif(NOT WIN32)
-
-INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
-
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 file(COPY doc/taglib.png DESTINATION doc)
-ADD_CUSTOM_TARGET(docs doxygen)
+add_custom_target(docs doxygen)

+# uninstall target
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+  COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -1,8 +1,3 @@
-# NOTE: only add something here if it is really needed by all of kdelibs.
-#     Otherwise please prefer adding to the relevant config-foo.h.cmake file,
-#     and the CMakeLists.txt that generates it (or a separate ConfigureChecks.make file if you prefer)
-#     to minimize recompilations and increase modularity.
-
 include(CheckIncludeFile)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
@@ -11,18 +6,18 @@ include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)

-#check for libz using the cmake supplied FindZLIB.cmake
-FIND_PACKAGE(ZLIB)
+# check for libz using the cmake supplied FindZLIB.cmake
+find_package(ZLIB)
+if(ZLIB_FOUND)
+	set(HAVE_ZLIB 1)
+else()
+	set(HAVE_ZLIB 0)
+endif()

-IF(ZLIB_FOUND)
-	SET(HAVE_ZLIB 1)
-ELSE(ZLIB_FOUND)
-	SET(HAVE_ZLIB 0)
-ENDIF(ZLIB_FOUND)
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+find_package(CppUnit)
+if(NOT CppUnit_FOUND AND BUILD_TESTS)
+	message(STATUS "CppUnit not found, disabling tests.")
+	set(BUILD_TESTS OFF)
+endif()

-SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
-FIND_PACKAGE(CppUnit)
-IF (NOT CppUnit_FOUND AND BUILD_TESTS)
-	MESSAGE(STATUS "CppUnit not found, disabling tests.")
-	SET(BUILD_TESTS OFF)
-ENDIF(NOT CppUnit_FOUND AND BUILD_TESTS)
--- a/30
+++ b/30
@@ -9,10 +9,31 @@ This can be done using the following commands:
  make
  sudo make install

-Some file formats in TagLib are not enabled by default, you can compile
-support for MP4 and WMA using the following options:
+In order to build the included examples, use the BUILD_EXAMPLES option:

-  cmake -DWITH_MP4=ON -DWITH_ASF=ON [...]
+  cmake -DBUILD_EXAMPLES=ON [...]
+
+See http://www.cmake.org/cmake/help/runningcmake.html for generic help on
+running CMake.
+
+Mac OS X Framework
+------------------
+
+On Mac OS X, you might want to build a framework that can be easily integrated
+into your application. If you set the BUILD_FRAMEWORK option on, it will compile
+TagLib as a framework. For example, the following command can be used to build
+an Universal Binary framework with Mac OS X 10.4 as the deployment target:
+
+  cmake -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_FRAMEWORK=ON \
+    -DCMAKE_C_COMPILER=/usr/bin/gcc-4.0 \
+    -DCMAKE_CXX_COMPILER=/usr/bin/c++-4.0 \
+    -DCMAKE_OSX_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk/ \
+    -DCMAKE_OSX_DEPLOYMENT_TARGET=10.4 \
+    -DCMAKE_OSX_ARCHITECTURES="ppc;i368;x86_64"
+
+Unit Tests
+----------

 If you want to run the test suite to make sure TagLib works properly on your
 system, you need to have cppunit installed. The test suite has a custom target
@@ -20,6 +41,3 @@ in the build system, so you can run the tests using make:

  make check

-See http://www.cmake.org/cmake/help/runningcmake.html for generic help on
-running CMake.
-
--- a/8
+++ b/8
@@ -1,3 +1,11 @@
+TagLib 1.8 (In Development)
+===========================
+
+ * Support for writing ID3v2.3 tags.
+ * Added methods for checking if WMA and MP4 files are DRM-protected.
+ * Started using atomic int operations for reference counting.
+ * Find APE tags even if there's a Lyrics3v2 tag present (BUG:254223).
+
 TagLib 1.7 (Mar 11, 2011)
 =========================

--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -1 +1 @@
-ADD_SUBDIRECTORY( c ) 
+add_subdirectory(c) 
--- a/bindings/README
+++ b/bindings/README
@@ -2,5 +2,5 @@ There are a few other people that have done bindings externally that I have
 been made aware of.  I have not personally reviewed these bindings, but I'm
 listing them here so that those who find them useful are able to find them:

- Ruby - http://www.hakubi.us/ruby-taglib/
- Python - http://namingmuse.berlios.de/
+http://developer.kde.org/~wheeler/taglib.html#bindings
+
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -1,37 +1,37 @@
-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/mpeg/id3v2/frames
-		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack
-		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex
-		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/trueaudio
+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/mpeg/id3v2/frames
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex
+  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/trueaudio
 )

+set(tag_c_HDRS tag_c.h)

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc )
-########### next target ###############
+add_library(tag_c tag_c.cpp ${tag_c_HDRS})

-ADD_LIBRARY(tag_c SHARED tag_c.cpp)
-if(ENABLE_STATIC)
-    set_target_properties(tag_c PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
-endif(ENABLE_STATIC)
-
-TARGET_LINK_LIBRARIES(tag_c  tag )
+target_link_libraries(tag_c tag)
+set_target_properties(tag_c PROPERTIES PUBLIC_HEADER "${tag_c_HDRS}")
+if(BUILD_FRAMEWORK)
+  set_target_properties(tag_c PROPERTIES FRAMEWORK TRUE)
+endif()

 # On Solaris we need to explicitly add the C++ standard and runtime
 # libraries to the libs used by the C bindings, because those C bindings
 # themselves won't pull in the C++ libs -- and if a C application is
 # using the C bindings then we get link errors.
-CHECK_LIBRARY_EXISTS(Crun __RTTI___ "" HAVE_CRUN_LIB)
-IF(HAVE_CRUN_LIB)
+check_library_exists(Crun __RTTI___ "" HAVE_CRUN_LIB)
+if(HAVE_CRUN_LIB)
  # Which libraries to link depends critically on which
  # STL version is going to be used by your application
  # and which runtime is in use. While Crun is pretty much
@@ -40,27 +40,29 @@ IF(HAVE_CRUN_LIB)
  # team supports stdcxx (Apache RogueWave stdcxx 4.1.3).
  
  # According to http://bugs.kde.org/show_bug.cgi?id=215225 the library can have the following two names:
-  FIND_LIBRARY(ROGUEWAVE_STDCXX_LIBRARY NAMES stdcxx4 stdcxx)
-  IF(NOT ROGUEWAVE_STDCXX_LIBRARY)
-    MESSAGE(FATAL_ERROR "Did not find supported STL library (tried stdcxx4 and stdcxx)")
-  ENDIF(NOT ROGUEWAVE_STDCXX_LIBRARY)
-  TARGET_LINK_LIBRARIES(tag_c ${ROGUEWAVE_STDCXX_LIBRARY} Crun)
-ENDIF(HAVE_CRUN_LIB)
+  find_library(ROGUEWAVE_STDCXX_LIBRARY NAMES stdcxx4 stdcxx)
+  if(NOT ROGUEWAVE_STDCXX_LIBRARY)
+    message(FATAL_ERROR "Did not find supported STL library (tried stdcxx4 and stdcxx)")
+  endif()
+  target_link_libraries(tag_c ${ROGUEWAVE_STDCXX_LIBRARY} Crun)
+endif()

-SET_TARGET_PROPERTIES(tag_c PROPERTIES
+set_target_properties(tag_c PROPERTIES
  VERSION 0.0.0
  SOVERSION 0
  DEFINE_SYMBOL MAKE_TAGLIB_C_LIB
  INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
-  )
-INSTALL(TARGETS tag_c
+)
+install(TARGETS tag_c
+	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-	ARCHIVE DESTINATION  ${LIB_INSTALL_DIR}
+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
 )

+if(NOT WIN32 AND NOT BUILD_FRAMEWORK)
+	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib_c.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc)
+	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+endif()

-########### install files ###############
-
-INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL( FILES  tag_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -23,8 +23,6 @@
 #include "config.h"
 #endif

-#include "tag_c.h"
-
 #include <stdlib.h>
 #include <fileref.h>
 #include <tfile.h>
@@ -42,6 +40,8 @@
 #include <string.h>
 #include <id3v2framefactory.h>

+#include "tag_c.h"
+
 using namespace TagLib;

 static List<char *> strings;
@@ -86,14 +86,10 @@ 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 TAGLIB_WITH_MP4
  case TagLib_File_MP4:
    return reinterpret_cast<TagLib_File *>(new MP4::File(filename));
-#endif
-#ifdef TAGLIB_WITH_ASF
  case TagLib_File_ASF:
    return reinterpret_cast<TagLib_File *>(new ASF::File(filename));
-#endif
  default:
    return 0;
  }
--- a/cmake_uninstall.cmake.in
+++ b/cmake_uninstall.cmake.in
@@ -0,0 +1,21 @@
+if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif()
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach (file ${files})
+  message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+  if (EXISTS "$ENV{DESTDIR}${file}")
+    execute_process(
+      COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
+      OUTPUT_VARIABLE rm_out
+      RESULT_VARIABLE rm_retval
+    )
+    if(NOT ${rm_retval} EQUAL 0)
+      message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+    endif ()
+  else ()
+    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+  endif ()
+endforeach()
--- a/config-taglib.h.cmake
+++ b/config-taglib.h.cmake
@@ -1,11 +1,11 @@
 /* config-taglib.h. Generated by cmake from config-taglib.h.cmake */

-/* NOTE: only add something here if it is really needed by all of kdelibs.
-   Otherwise please prefer adding to the relevant config-foo.h.cmake file,
-   to minimize recompilations and increase modularity. */
 /* Define if you have libz */
 #cmakedefine   HAVE_ZLIB 1

 #cmakedefine   NO_ITUNES_HACKS 1
 #cmakedefine   WITH_ASF 1
 #cmakedefine   WITH_MP4 1
+
+#cmakedefine TESTS_DIR "@TESTS_DIR@"
+
--- a/include/README
+++ b/include/README
@@ -1,16 +0,0 @@
-These are only necessary at build-time when building the entire kdesupport module; they do not need to be installed on a running system.
-
-It can be regenerated by using something like the following from the taglib/taglib directory:
-
-for file in `find -type f -name "*\.h"`;
-do 
-  dir=`dirname $file`
-  strippeddir=`echo $dir | cut -c 3-`
-  base=`basename $file`
-  if test -z $strippeddir
-  then
-    echo "#include \"../taglib/$base\"" > ../include/$base
-  else
-    echo "#include \"../taglib/$strippeddir/$base\"" > ../include/$base
-  fi
-done
--- a/include/aifffile.h
+++ b/include/aifffile.h
@@ -1 +0,0 @@
-#include "../taglib/riff/aiff/aifffile.h"
--- a/include/aiffproperties.h
+++ b/include/aiffproperties.h
@@ -1 +0,0 @@
-#include "../taglib/riff/aiff/aiffproperties.h"
--- a/include/apefooter.h
+++ b/include/apefooter.h
@@ -1 +0,0 @@
-#include "../taglib/ape/apefooter.h"
--- a/include/apeitem.h
+++ b/include/apeitem.h
@@ -1 +0,0 @@
-#include "../taglib/ape/apeitem.h"
--- a/include/apetag.h
+++ b/include/apetag.h
@@ -1 +0,0 @@
-#include "../taglib/ape/apetag.h"
--- a/include/asfattribute.h
+++ b/include/asfattribute.h
@@ -1 +0,0 @@
-#include "../taglib/asf/asfattribute.h"
--- a/include/asffile.h
+++ b/include/asffile.h
@@ -1 +0,0 @@
-#include "../taglib/asf/asffile.h"
--- a/include/asfproperties.h
+++ b/include/asfproperties.h
@@ -1 +0,0 @@
-#include "../taglib/asf/asfproperties.h"
--- a/include/asftag.h
+++ b/include/asftag.h
@@ -1 +0,0 @@
-#include "../taglib/asf/asftag.h"
--- a/include/attachedpictureframe.h
+++ b/include/attachedpictureframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"
--- a/include/audioproperties.h
+++ b/include/audioproperties.h
@@ -1 +0,0 @@
-#include "../taglib/audioproperties.h"
--- a/include/commentsframe.h
+++ b/include/commentsframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/commentsframe.h"
--- a/include/fileref.h
+++ b/include/fileref.h
@@ -1 +0,0 @@
-#include "../taglib/fileref.h"
--- a/include/flacfile.h
+++ b/include/flacfile.h
@@ -1 +0,0 @@
-#include "../taglib/flac/flacfile.h"
--- a/include/flacproperties.h
+++ b/include/flacproperties.h
@@ -1 +0,0 @@
-#include "../taglib/flac/flacproperties.h"
--- a/include/generalencapsulatedobjectframe.h
+++ b/include/generalencapsulatedobjectframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"
--- a/include/id3v1genres.h
+++ b/include/id3v1genres.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v1/id3v1genres.h"
--- a/include/id3v1tag.h
+++ b/include/id3v1tag.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v1/id3v1tag.h"
--- a/include/id3v2extendedheader.h
+++ b/include/id3v2extendedheader.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"
--- a/include/id3v2footer.h
+++ b/include/id3v2footer.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2footer.h"
--- a/include/id3v2frame.h
+++ b/include/id3v2frame.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2frame.h"
--- a/include/id3v2framefactory.h
+++ b/include/id3v2framefactory.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2framefactory.h"
--- a/include/id3v2header.h
+++ b/include/id3v2header.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2header.h"
--- a/include/id3v2synchdata.h
+++ b/include/id3v2synchdata.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2synchdata.h"
--- a/include/id3v2tag.h
+++ b/include/id3v2tag.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/id3v2tag.h"
--- a/include/mp4atom.h
+++ b/include/mp4atom.h
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4atom.h"
--- a/include/mp4coverart.h
+++ b/include/mp4coverart.h
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4coverart.h"
--- a/include/mp4file.h
+++ b/include/mp4file.h
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4file.h"
--- a/include/mp4item.h
+++ b/include/mp4item.h
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4item.h"
--- a/include/mp4properties.h
+++ b/include/mp4properties.h
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4properties.h"
--- a/include/mp4tag.h
+++ b/include/mp4tag.h
@@ -1 +0,0 @@
-#include "../taglib/mp4/mp4tag.h"
--- a/include/mpcfile.h
+++ b/include/mpcfile.h
@@ -1 +0,0 @@
-#include "../taglib/mpc/mpcfile.h"
--- a/include/mpcproperties.h
+++ b/include/mpcproperties.h
@@ -1 +0,0 @@
-#include "../taglib/mpc/mpcproperties.h"
--- a/include/mpegfile.h
+++ b/include/mpegfile.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/mpegfile.h"
--- a/include/mpegheader.h
+++ b/include/mpegheader.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/mpegheader.h"
--- a/include/mpegproperties.h
+++ b/include/mpegproperties.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/mpegproperties.h"
--- a/include/oggfile.h
+++ b/include/oggfile.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/oggfile.h"
--- a/include/oggflacfile.h
+++ b/include/oggflacfile.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/flac/oggflacfile.h"
--- a/include/oggpage.h
+++ b/include/oggpage.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/oggpage.h"
--- a/include/oggpageheader.h
+++ b/include/oggpageheader.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/oggpageheader.h"
--- a/include/popularimeterframe.h
+++ b/include/popularimeterframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/popularimeterframe.h"
--- a/include/privateframe.h
+++ b/include/privateframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/privateframe.h"
--- a/include/relativevolumeframe.h
+++ b/include/relativevolumeframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/relativevolumeframe.h"
--- a/include/rifffile.h
+++ b/include/rifffile.h
@@ -1 +0,0 @@
-#include "../taglib/riff/rifffile.h"
--- a/include/speexfile.h
+++ b/include/speexfile.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/speex/speexfile.h"
--- a/include/speexproperties.h
+++ b/include/speexproperties.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/speex/speexproperties.h"
--- a/include/tag.h
+++ b/include/tag.h
@@ -1 +0,0 @@
-#include "../taglib/tag.h"
--- a/include/taglib.h
+++ b/include/taglib.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/taglib.h"
--- a/include/taglib_export.h
+++ b/include/taglib_export.h
@@ -1 +0,0 @@
-#include "../taglib/taglib_export.h"
--- a/include/tagunion.h
+++ b/include/tagunion.h
@@ -1 +0,0 @@
-#include "../taglib/tagunion.h"
--- a/include/tbytevector.h
+++ b/include/tbytevector.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tbytevector.h"
--- a/include/tbytevectorlist.h
+++ b/include/tbytevectorlist.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tbytevectorlist.h"
--- a/include/tdebug.h
+++ b/include/tdebug.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tdebug.h"
--- a/include/textidentificationframe.h
+++ b/include/textidentificationframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/textidentificationframe.h"
--- a/include/tfile.h
+++ b/include/tfile.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tfile.h"
--- a/include/tlist.h
+++ b/include/tlist.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tlist.h"
--- a/include/tmap.h
+++ b/include/tmap.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tmap.h"
--- a/include/trueaudiofile.h
+++ b/include/trueaudiofile.h
@@ -1 +0,0 @@
-#include "../taglib/trueaudio/trueaudiofile.h"
--- a/include/trueaudioproperties.h
+++ b/include/trueaudioproperties.h
@@ -1 +0,0 @@
-#include "../taglib/trueaudio/trueaudioproperties.h"
--- a/include/tstring.h
+++ b/include/tstring.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tstring.h"
--- a/include/tstringlist.h
+++ b/include/tstringlist.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/tstringlist.h"
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -1 +0,0 @@
-#include "../taglib/toolkit/unicode.h"
--- a/include/uniquefileidentifierframe.h
+++ b/include/uniquefileidentifierframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h"
--- a/include/unknownframe.h
+++ b/include/unknownframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/unknownframe.h"
--- a/include/unsynchronizedlyricsframe.h
+++ b/include/unsynchronizedlyricsframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h"
--- a/include/urllinkframe.h
+++ b/include/urllinkframe.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/id3v2/frames/urllinkframe.h"
--- a/include/vorbisfile.h
+++ b/include/vorbisfile.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/vorbis/vorbisfile.h"
--- a/include/vorbisproperties.h
+++ b/include/vorbisproperties.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/vorbis/vorbisproperties.h"
--- a/include/wavfile.h
+++ b/include/wavfile.h
@@ -1 +0,0 @@
-#include "../taglib/riff/wav/wavfile.h"
--- a/include/wavpackfile.h
+++ b/include/wavpackfile.h
@@ -1 +0,0 @@
-#include "../taglib/wavpack/wavpackfile.h"
--- a/include/wavpackproperties.h
+++ b/include/wavpackproperties.h
@@ -1 +0,0 @@
-#include "../taglib/wavpack/wavpackproperties.h"
--- a/include/wavproperties.h
+++ b/include/wavproperties.h
@@ -1 +0,0 @@
-#include "../taglib/riff/wav/wavproperties.h"
--- a/include/xingheader.h
+++ b/include/xingheader.h
@@ -1 +0,0 @@
-#include "../taglib/mpeg/xingheader.h"
--- a/include/xiphcomment.h
+++ b/include/xiphcomment.h
@@ -1 +0,0 @@
-#include "../taglib/ogg/xiphcomment.h"
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -1,219 +1,317 @@
-
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
-INCLUDE_DIRECTORIES(
-    ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
-    ${CMAKE_CURRENT_SOURCE_DIR}/asf
-    ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
-    ${CMAKE_CURRENT_SOURCE_DIR}/ogg
-    ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
-    ${CMAKE_CURRENT_SOURCE_DIR}/flac
-    ${CMAKE_CURRENT_SOURCE_DIR}/mpc
-    ${CMAKE_CURRENT_SOURCE_DIR}/mp4
-    ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
-    ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
-    ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
-    ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
-    ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
-    ${CMAKE_CURRENT_SOURCE_DIR}/ape
-    ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
-    ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
-    ${CMAKE_CURRENT_SOURCE_DIR}/riff
-    ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
-    ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
-    ${CMAKE_CURRENT_BINARY_DIR}/..
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
+  ${CMAKE_CURRENT_SOURCE_DIR}/asf
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
+  ${CMAKE_CURRENT_SOURCE_DIR}/flac
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpc
+  ${CMAKE_CURRENT_SOURCE_DIR}/mp4
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
+  ${CMAKE_CURRENT_SOURCE_DIR}/ape
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
+  ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
+  ${CMAKE_CURRENT_SOURCE_DIR}/mod
+  ${CMAKE_CURRENT_SOURCE_DIR}/s3m
+  ${CMAKE_CURRENT_SOURCE_DIR}/it
+  ${CMAKE_CURRENT_SOURCE_DIR}/xm
 )
+
 if(ZLIB_FOUND)
-    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
-endif(ZLIB_FOUND)
+  include_directories(${ZLIB_INCLUDE_DIR})
+endif()

-ADD_SUBDIRECTORY( toolkit )
-ADD_SUBDIRECTORY( asf )
-ADD_SUBDIRECTORY( mpeg )
-ADD_SUBDIRECTORY( ogg )
-ADD_SUBDIRECTORY( flac )
-ADD_SUBDIRECTORY( ape )
-ADD_SUBDIRECTORY( mpc )
-ADD_SUBDIRECTORY( mp4 )
-ADD_SUBDIRECTORY( wavpack )
-ADD_SUBDIRECTORY( trueaudio )
-ADD_SUBDIRECTORY( riff )
-
-########### next target ###############
-
-SET(mpeg_SRCS
-mpeg/mpegfile.cpp
-mpeg/mpegproperties.cpp
-mpeg/mpegheader.cpp
-mpeg/xingheader.cpp
+set(tag_HDRS
+  tag.h
+  fileref.h
+  audioproperties.h
+  taglib_export.h
+  ${CMAKE_BINARY_DIR}/taglib_config.h
+  toolkit/taglib.h
+  toolkit/tstring.h
+  toolkit/tlist.h
+  toolkit/tlist.tcc
+  toolkit/tstringlist.h
+  toolkit/tbytevector.h
+  toolkit/tbytevectorlist.h
+  toolkit/tbytevectorstream.h
+  toolkit/tiostream.h
+  toolkit/tfile.h
+  toolkit/tfilestream.h
+  toolkit/tmap.h
+  toolkit/tmap.tcc
+  mpeg/mpegfile.h
+  mpeg/mpegproperties.h
+  mpeg/mpegheader.h
+  mpeg/xingheader.h
+  mpeg/id3v1/id3v1tag.h
+  mpeg/id3v1/id3v1genres.h
+  mpeg/id3v2/id3v2extendedheader.h
+  mpeg/id3v2/id3v2frame.h
+  mpeg/id3v2/id3v2header.h
+  mpeg/id3v2/id3v2synchdata.h
+  mpeg/id3v2/id3v2footer.h
+  mpeg/id3v2/id3v2framefactory.h
+  mpeg/id3v2/id3v2tag.h
+  mpeg/id3v2/frames/attachedpictureframe.h
+  mpeg/id3v2/frames/commentsframe.h
+  mpeg/id3v2/frames/generalencapsulatedobjectframe.h
+  mpeg/id3v2/frames/popularimeterframe.h
+  mpeg/id3v2/frames/privateframe.h
+  mpeg/id3v2/frames/relativevolumeframe.h
+  mpeg/id3v2/frames/textidentificationframe.h
+  mpeg/id3v2/frames/uniquefileidentifierframe.h
+  mpeg/id3v2/frames/unknownframe.h
+  mpeg/id3v2/frames/unsynchronizedlyricsframe.h
+  mpeg/id3v2/frames/urllinkframe.h
+  ogg/oggfile.h
+  ogg/oggpage.h
+  ogg/oggpageheader.h
+  ogg/xiphcomment.h
+  ogg/vorbis/vorbisfile.h
+  ogg/vorbis/vorbisproperties.h
+  ogg/flac/oggflacfile.h
+  ogg/speex/speexfile.h
+  ogg/speex/speexproperties.h
+  flac/flacfile.h
+  flac/flacpicture.h
+  flac/flacproperties.h
+  flac/flacmetadatablock.h
+  ape/apefile.h
+  ape/apeproperties.h
+  ape/apetag.h
+  ape/apefooter.h
+  ape/apeitem.h
+  mpc/mpcfile.h
+  mpc/mpcproperties.h
+  wavpack/wavpackfile.h
+  wavpack/wavpackproperties.h
+  trueaudio/trueaudiofile.h
+  trueaudio/trueaudioproperties.h
+  riff/rifffile.h
+  riff/aiff/aifffile.h
+  riff/aiff/aiffproperties.h
+  riff/wav/wavfile.h
+  riff/wav/wavproperties.h
+  asf/asffile.h
+  asf/asfproperties.h
+  asf/asftag.h
+  asf/asfattribute.h
+  asf/asfpicture.h
+  mp4/mp4file.h
+  mp4/mp4atom.h
+  mp4/mp4tag.h
+  mp4/mp4item.h
+  mp4/mp4properties.h
+  mp4/mp4coverart.h
+  mod/modfilebase.h
+  mod/modfile.h
+  mod/modtag.h
+  mod/modproperties.h
+  it/itfile.h
+  it/itproperties.h
+  s3m/s3mfile.h
+  s3m/s3mproperties.h
+  xm/xmfile.h
+  xm/xmproperties.h
 )

-SET(id3v1_SRCS
-mpeg/id3v1/id3v1tag.cpp
-mpeg/id3v1/id3v1genres.cpp
+set(mpeg_SRCS
+  mpeg/mpegfile.cpp
+  mpeg/mpegproperties.cpp
+  mpeg/mpegheader.cpp
+  mpeg/xingheader.cpp
 )

-
-SET(id3v2_SRCS
-mpeg/id3v2/id3v2framefactory.cpp
-mpeg/id3v2/id3v2synchdata.cpp
-mpeg/id3v2/id3v2tag.cpp
-mpeg/id3v2/id3v2header.cpp
-mpeg/id3v2/id3v2frame.cpp
-mpeg/id3v2/id3v2footer.cpp
-mpeg/id3v2/id3v2extendedheader.cpp
+set(id3v1_SRCS
+  mpeg/id3v1/id3v1tag.cpp
+  mpeg/id3v1/id3v1genres.cpp
 )

+set(id3v2_SRCS
+  mpeg/id3v2/id3v2framefactory.cpp
+  mpeg/id3v2/id3v2synchdata.cpp
+  mpeg/id3v2/id3v2tag.cpp
+  mpeg/id3v2/id3v2header.cpp
+  mpeg/id3v2/id3v2frame.cpp
+  mpeg/id3v2/id3v2footer.cpp
+  mpeg/id3v2/id3v2extendedheader.cpp
+  )

-SET(frames_SRCS
-mpeg/id3v2/frames/attachedpictureframe.cpp
-mpeg/id3v2/frames/commentsframe.cpp
-mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
-mpeg/id3v2/frames/popularimeterframe.cpp
-mpeg/id3v2/frames/privateframe.cpp
-mpeg/id3v2/frames/relativevolumeframe.cpp
-mpeg/id3v2/frames/textidentificationframe.cpp
-mpeg/id3v2/frames/uniquefileidentifierframe.cpp
-mpeg/id3v2/frames/unknownframe.cpp
-mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
-mpeg/id3v2/frames/urllinkframe.cpp
+set(frames_SRCS
+  mpeg/id3v2/frames/attachedpictureframe.cpp
+  mpeg/id3v2/frames/commentsframe.cpp
+  mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
+  mpeg/id3v2/frames/popularimeterframe.cpp
+  mpeg/id3v2/frames/privateframe.cpp
+  mpeg/id3v2/frames/relativevolumeframe.cpp
+  mpeg/id3v2/frames/textidentificationframe.cpp
+  mpeg/id3v2/frames/uniquefileidentifierframe.cpp
+  mpeg/id3v2/frames/unknownframe.cpp
+  mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
+  mpeg/id3v2/frames/urllinkframe.cpp
 )

-SET(ogg_SRCS
-ogg/oggfile.cpp
-ogg/oggpage.cpp
-ogg/oggpageheader.cpp
-ogg/xiphcomment.cpp
+set(ogg_SRCS
+  ogg/oggfile.cpp
+  ogg/oggpage.cpp
+  ogg/oggpageheader.cpp
+  ogg/xiphcomment.cpp
 )

-SET(vorbis_SRCS
-ogg/vorbis/vorbisfile.cpp
-ogg/vorbis/vorbisproperties.cpp
+set(vorbis_SRCS
+  ogg/vorbis/vorbisfile.cpp
+  ogg/vorbis/vorbisproperties.cpp
 )

-
-SET(flacs_SRCS
-flac/flacfile.cpp
-flac/flacpicture.cpp
-flac/flacproperties.cpp
-flac/flacmetadatablock.cpp
-flac/flacunknownmetadatablock.cpp
+set(flacs_SRCS
+  flac/flacfile.cpp
+  flac/flacpicture.cpp
+  flac/flacproperties.cpp
+  flac/flacmetadatablock.cpp
+  flac/flacunknownmetadatablock.cpp
 )

-SET(oggflacs_SRCS
-ogg/flac/oggflacfile.cpp
+set(oggflacs_SRCS
+  ogg/flac/oggflacfile.cpp
 )

-SET(mpc_SRCS
-mpc/mpcfile.cpp
-mpc/mpcproperties.cpp
+set(mpc_SRCS
+  mpc/mpcfile.cpp
+  mpc/mpcproperties.cpp
 )

-IF(WITH_MP4)
-SET(mp4_SRCS
-mp4/mp4file.cpp
-mp4/mp4atom.cpp
-mp4/mp4tag.cpp
-mp4/mp4item.cpp
-mp4/mp4properties.cpp
-mp4/mp4coverart.cpp
-)
-ELSE(WITH_MP4)
-SET(mp4_SRCS)
-ENDIF(WITH_MP4)
-
-SET(ape_SRCS
-ape/apetag.cpp
-ape/apefooter.cpp
-ape/apeitem.cpp
-ape/apefile.cpp
-ape/apeproperties.cpp
+set(mp4_SRCS
+  mp4/mp4file.cpp
+  mp4/mp4atom.cpp
+  mp4/mp4tag.cpp
+  mp4/mp4item.cpp
+  mp4/mp4properties.cpp
+  mp4/mp4coverart.cpp
 )

-SET(wavpack_SRCS
-wavpack/wavpackfile.cpp
-wavpack/wavpackproperties.cpp
+set(ape_SRCS
+  ape/apetag.cpp
+  ape/apefooter.cpp
+  ape/apeitem.cpp
+  ape/apefile.cpp
+  ape/apeproperties.cpp
 )

-SET(speex_SRCS
-ogg/speex/speexfile.cpp
-ogg/speex/speexproperties.cpp
+set(wavpack_SRCS
+  wavpack/wavpackfile.cpp
+  wavpack/wavpackproperties.cpp
 )

-SET(trueaudio_SRCS
-trueaudio/trueaudiofile.cpp
-trueaudio/trueaudioproperties.cpp
+set(speex_SRCS
+  ogg/speex/speexfile.cpp
+  ogg/speex/speexproperties.cpp
 )

-IF(WITH_ASF)
-SET(asf_SRCS
-asf/asftag.cpp
-asf/asffile.cpp
-asf/asfproperties.cpp
-asf/asfattribute.cpp
-asf/asfpicture.cpp
-)
-ELSE(WITH_ASF)
-SET(asf_SRCS)
-ENDIF(WITH_ASF)
-
-SET(riff_SRCS
-riff/rifffile.cpp
+set(trueaudio_SRCS
+  trueaudio/trueaudiofile.cpp
+  trueaudio/trueaudioproperties.cpp
 )

-SET(aiff_SRCS
-riff/aiff/aifffile.cpp
-riff/aiff/aiffproperties.cpp
+set(asf_SRCS
+  asf/asftag.cpp
+  asf/asffile.cpp
+  asf/asfproperties.cpp
+  asf/asfattribute.cpp
+  asf/asfpicture.cpp
 )

-SET(wav_SRCS
-riff/wav/wavfile.cpp
-riff/wav/wavproperties.cpp
+set(riff_SRCS
+  riff/rifffile.cpp
 )

-SET(toolkit_SRCS
-toolkit/tstring.cpp
-toolkit/tstringlist.cpp
-toolkit/tbytevector.cpp
-toolkit/tbytevectorlist.cpp
-toolkit/tfile.cpp
-toolkit/tdebug.cpp
-toolkit/unicode.cpp
+set(aiff_SRCS
+  riff/aiff/aifffile.cpp
+  riff/aiff/aiffproperties.cpp
 )

-SET(tag_LIB_SRCS ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
-		 ${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
-		 ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS} ${wav_SRCS}
-		 ${mp4_SRCS} ${asf_SRCS}
-		 tag.cpp
-		 tagunion.cpp
-		 fileref.cpp
-		 audioproperties.cpp
+set(wav_SRCS
+  riff/wav/wavfile.cpp
+  riff/wav/wavproperties.cpp
 )

+set(mod_SRCS
+  mod/modfilebase.cpp
+  mod/modfile.cpp
+  mod/modtag.cpp
+  mod/modproperties.cpp
+)

-if(ENABLE_STATIC)
-    add_library(tag STATIC ${tag_LIB_SRCS})
-    set_target_properties(tag PROPERTIES COMPILE_DEFINITIONS TAGLIB_STATIC)
-else(ENABLE_STATIC)
-    add_library(tag SHARED ${tag_LIB_SRCS})
-endif(ENABLE_STATIC)
+set(s3m_SRCS
+  s3m/s3mfile.cpp
+  s3m/s3mproperties.cpp
+)
+
+set(it_SRCS
+  it/itfile.cpp
+  it/itproperties.cpp
+)
+
+set(xm_SRCS
+  xm/xmfile.cpp
+  xm/xmproperties.cpp
+)
+
+set(toolkit_SRCS
+  toolkit/tstring.cpp
+  toolkit/tstringlist.cpp
+  toolkit/tbytevector.cpp
+  toolkit/tbytevectorlist.cpp
+  toolkit/tbytevectorstream.cpp
+  toolkit/tiostream.cpp
+  toolkit/tfile.cpp
+  toolkit/tfilestream.cpp
+  toolkit/tdebug.cpp
+  toolkit/unicode.cpp
+)
+
+set(tag_LIB_SRCS
+  ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
+  ${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
+  ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS} ${wav_SRCS}
+  ${asf_SRCS} ${mp4_SRCS} ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS}
+  tag.cpp
+  tagunion.cpp
+  fileref.cpp
+  audioproperties.cpp
+)
+
+add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})

-TARGET_LINK_LIBRARIES(tag )
 if(ZLIB_FOUND)
-	TARGET_LINK_LIBRARIES(tag ${ZLIB_LIBRARIES})
-endif(ZLIB_FOUND)
+	target_link_libraries(tag ${ZLIB_LIBRARIES})
+endif()

-SET_TARGET_PROPERTIES(tag PROPERTIES
-        VERSION ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
-        SOVERSION ${TAGLIB_LIB_MAJOR_VERSION}
-        INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
-        DEFINE_SYMBOL MAKE_TAGLIB_LIB
-        LINK_INTERFACE_LIBRARIES ""
+set_target_properties(tag PROPERTIES
+  VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
+  SOVERSION ${TAGLIB_SOVERSION_MAJOR}
+  INSTALL_NAME_DIR ${LIB_INSTALL_DIR}
+  DEFINE_SYMBOL MAKE_TAGLIB_LIB
+  LINK_INTERFACE_LIBRARIES ""
+  PUBLIC_HEADER "${tag_HDRS}"
 )
-INSTALL(TARGETS tag
+if(BUILD_FRAMEWORK)
+  set_target_properties(tag PROPERTIES FRAMEWORK TRUE)
+endif()
+
+install(TARGETS tag
+	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-	ARCHIVE DESTINATION  ${LIB_INSTALL_DIR}
+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
 )

-INSTALL( FILES  tag.h fileref.h audioproperties.h taglib_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
--- a/taglib/ape/CMakeLists.txt
+++ b/taglib/ape/CMakeLists.txt
@@ -1 +0,0 @@
-INSTALL( FILES apefile.h apeproperties.h apetag.h apefooter.h apeitem.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
--- a/taglib/ape/apefile.cpp
+++ b/taglib/ape/apefile.cpp
@@ -92,6 +92,13 @@ APE::File::File(FileName file, bool readProperties,
  read(readProperties, propertiesStyle);
 }

+APE::File::File(IOStream *stream, bool readProperties,
+                Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
+{
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
+}
+
 APE::File::~File()
 {
  delete d;
--- a/taglib/ape/apefile.h
+++ b/taglib/ape/apefile.h
@@ -91,6 +91,14 @@ namespace TagLib {
      File(FileName file, bool readProperties = true,
           Properties::ReadStyle propertiesStyle = Properties::Average);

+      /*!
+       * Contructs an WavPack file from \a file.  If \a readProperties is true the
+       * file's audio properties will also be read using \a propertiesStyle.  If
+       * false, \a propertiesStyle is ignored.
+       */
+      File(IOStream *stream, bool readProperties = true,
+           Properties::ReadStyle propertiesStyle = Properties::Average);
+
      /*!
       * Destroys this instance of the File.
       */
--- a/taglib/asf/CMakeLists.txt
+++ b/taglib/asf/CMakeLists.txt
@@ -1 +0,0 @@
-INSTALL( FILES  asffile.h asfproperties.h asftag.h asfattribute.h asfpicture.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
--- a/taglib/asf/asfattribute.cpp
+++ b/taglib/asf/asfattribute.cpp
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif

-#ifdef WITH_ASF
-
 #include <taglib.h>
 #include <tdebug.h>
 #include "asfattribute.h"
@@ -353,4 +351,3 @@ void ASF::Attribute::setStream(int value)
  d->stream = value;
 }

-#endif
--- a/taglib/asf/asffile.cpp
+++ b/taglib/asf/asffile.cpp
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif

-#ifdef WITH_ASF
-
 #include <tdebug.h>
 #include <tbytevectorlist.h>
 #include <tstring.h>
@@ -69,6 +67,9 @@ static ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x
 static ByteVector headerExtensionGuid("\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se", 16);
 static ByteVector metadataGuid("\xEA\xCB\xF8\xC5\xAF[wH\204g\xAA\214D\xFAL\xCA", 16);
 static ByteVector metadataLibraryGuid("\224\034#D\230\224\321I\241A\x1d\x13NEpT", 16);
+static ByteVector contentEncryptionGuid("\xFB\xB3\x11\x22\x23\xBD\xD2\x11\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E", 16);
+static ByteVector extendedContentEncryptionGuid("\x14\xE6\x8A\x29\x22\x26 \x17\x4C\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C", 16);
+static ByteVector advancedContentEncryptionGuid("\xB6\x9B\x07\x7A\xA4\xDA\x12\x4E\xA5\xCA\x91\xD3\x8D\xC1\x1A\x8D", 16);

 class ASF::File::BaseObject
 {
@@ -366,6 +367,13 @@ ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle proper
  read(readProperties, propertiesStyle);
 }

+ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) 
+  : TagLib::File(stream)
+{
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
+}
+
 ASF::File::~File()
 {
  for(unsigned int i = 0; i < d->objects.size(); i++) {
@@ -446,6 +454,11 @@ void ASF::File::read(bool /*readProperties*/, Properties::ReadStyle /*properties
      obj = new HeaderExtensionObject();
    }
    else {
+      if(guid == contentEncryptionGuid ||
+         guid == extendedContentEncryptionGuid ||
+         guid == advancedContentEncryptionGuid) {
+        d->properties->setEncrypted(true);
+      }
      obj = new UnknownObject(guid);
    }
    obj->parse(this, size);
@@ -592,4 +605,3 @@ ByteVector ASF::File::renderString(const String &str, bool includeLength)
  return data;
 }

-#endif
--- a/taglib/asf/asffile.h
+++ b/taglib/asf/asffile.h
@@ -57,6 +57,16 @@ namespace TagLib {
       */
      File(FileName file, bool readProperties = true, Properties::ReadStyle propertiesStyle = Properties::Average);

+      /*!
+       * Contructs an ASF file from \a file.  If \a readProperties is true the
+       * file's audio properties will also be read using \a propertiesStyle.  If
+       * false, \a propertiesStyle is ignored.
+       *
+       * \note In the current implementation, both \a readProperties and
+       * \a propertiesStyle are ignored.
+       */
+      File(IOStream *stream, bool readProperties = true, Properties::ReadStyle propertiesStyle = Properties::Average);
+
      /*!
       * Destroys this instance of the File.
       */
--- a/taglib/asf/asfpicture.cpp
+++ b/taglib/asf/asfpicture.cpp
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif

-#ifdef WITH_ASF
-
 #include <taglib.h>
 #include <tdebug.h>
 #include "asfattribute.h"
@@ -182,4 +180,3 @@ ASF::Picture ASF::Picture::fromInvalid()
  return ret;
 }

-#endif
--- a/taglib/asf/asfproperties.cpp
+++ b/taglib/asf/asfproperties.cpp
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif

-#ifdef WITH_ASF
-
 #include <tdebug.h>
 #include <tstring.h>
 #include "asfproperties.h"
@@ -38,11 +36,12 @@ using namespace TagLib;
 class ASF::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate(): length(0), bitrate(0), sampleRate(0), channels(0) {}
+  PropertiesPrivate(): length(0), bitrate(0), sampleRate(0), channels(0), encrypted(false) {}
  int length;
  int bitrate;
  int sampleRate;
  int channels;
+  bool encrypted;
 };

 ////////////////////////////////////////////////////////////////////////////////
@@ -80,6 +79,11 @@ int ASF::Properties::channels() const
  return d->channels;
 } 

+bool ASF::Properties::isEncrypted() const
+{
+  return d->encrypted;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
@@ -104,4 +108,8 @@ void ASF::Properties::setChannels(int length)
  d->channels = length;
 }

-#endif
+void ASF::Properties::setEncrypted(bool encrypted)
+{
+  d->encrypted = encrypted;
+}
+
--- a/taglib/asf/asfproperties.h
+++ b/taglib/asf/asfproperties.h
@@ -54,12 +54,14 @@ namespace TagLib {
      virtual int bitrate() const;
      virtual int sampleRate() const;
      virtual int channels() const;
+      bool isEncrypted() const;

 #ifndef DO_NOT_DOCUMENT
      void setLength(int value);
      void setBitrate(int value);
      void setSampleRate(int value);
      void setChannels(int value);
+      void setEncrypted(bool value);
 #endif

    private:
--- a/taglib/asf/asftag.cpp
+++ b/taglib/asf/asftag.cpp
@@ -27,8 +27,6 @@
 #include <config.h>
 #endif

-#ifdef WITH_ASF
-
 #include "asftag.h"

 using namespace TagLib;
@@ -198,4 +196,3 @@ bool ASF::Tag::isEmpty() const
         d->attributeListMap.isEmpty();
 }

-#endif
--- a/taglib/fileref.cpp
+++ b/taglib/fileref.cpp
@@ -49,6 +49,10 @@
 #include "aifffile.h"
 #include "wavfile.h"
 #include "apefile.h"
+#include "modfile.h"
+#include "s3mfile.h"
+#include "itfile.h"
+#include "xmfile.h"

 using namespace TagLib;

@@ -147,21 +151,24 @@ StringList FileRef::defaultFileExtensions()
  l.append("wv");
  l.append("spx");
  l.append("tta");
-#ifdef TAGLIB_WITH_MP4
  l.append("m4a");
  l.append("m4b");
  l.append("m4p");
  l.append("3g2");
  l.append("mp4");
-#endif
-#ifdef TAGLIB_WITH_ASF
  l.append("wma");
  l.append("asf");
-#endif
  l.append("aif");
  l.append("aiff");
  l.append("wav");
  l.append("ape");
+  l.append("mod");
+  l.append("module"); // alias for "mod"
+  l.append("nst"); // alias for "mod"
+  l.append("wow"); // alias for "mod"
+  l.append("s3m");
+  l.append("it");
+  l.append("xm");

  return l;
 }
@@ -246,20 +253,25 @@ File *FileRef::create(FileName fileName, bool readAudioProperties,
      return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
    if(ext == "TTA")
      return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
-#ifdef TAGLIB_WITH_MP4
    if(ext == "M4A" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2")
      return new MP4::File(fileName, readAudioProperties, audioPropertiesStyle);
-#endif
-#ifdef TAGLIB_WITH_ASF
    if(ext == "WMA" || ext == "ASF")
      return new ASF::File(fileName, readAudioProperties, audioPropertiesStyle);
-#endif
    if(ext == "AIF" || ext == "AIFF")
      return new RIFF::AIFF::File(fileName, readAudioProperties, audioPropertiesStyle);
    if(ext == "WAV")
      return new RIFF::WAV::File(fileName, readAudioProperties, audioPropertiesStyle);
    if(ext == "APE")
      return new APE::File(fileName, readAudioProperties, audioPropertiesStyle);
+    // module, nst and wow are possible but uncommon extensions
+    if(ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
+      return new Mod::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "S3M")
+      return new S3M::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "IT")
+      return new IT::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "XM")
+      return new XM::File(fileName, readAudioProperties, audioPropertiesStyle);
  }

  return 0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukáš Lalinský	36d9c94f1f	Add unit tests	2011-07-14 14:13:24 +02:00
Lukáš Lalinský	b53c08c067	Merge remote branch 'HessiJames/master'	2011-07-14 13:40:33 +02:00
Daniel Faust	0ea8e44df7	String to number conversion moved to new function - long readNumber(ByteVector vector)	2011-07-07 17:57:22 +02:00
Daniel Faust	27332c35ac	Find APE tags even if there's a Lyrics3v2 tag present http://bugs.kde.org/show_bug.cgi?id=254223	2011-07-05 17:24:59 +02:00
Mathias Panzenböck	2fd10b5fd5	corrected comments	2011-06-28 02:55:03 +02:00
Mathias Panzenböck	a50886c3c7	Merge branch 'master' of https://github.com/taglib/taglib	2011-06-28 01:37:48 +02:00
Mathias Panzenböck	2119494cd1	added uninstall target	2011-06-26 21:58:51 +02:00
Scott Wheeler	843070ba18	Tabs be gone	2011-06-26 21:37:01 +02:00
Mathias Panzenböck	57bf96d169	Merge branch 'master' of https://github.com/taglib/taglib	2011-06-26 20:58:32 +02:00
Lukáš Lalinský	937d69f91d	Fix indentation	2011-06-25 12:17:31 +02:00
Mathias Panzenböck	f3447ae38d	style fixes for enum value names	2011-06-25 01:54:22 +02:00
Mathias Panzenböck	89861cf77a	style fixes: { on same line with if/else/for	2011-06-25 01:10:19 +02:00
Mathias Panzenböck	a04d7d0bbc	Merge branch 'master' of https://github.com/taglib/taglib Conflicts: taglib/CMakeLists.txt tests/CMakeLists.txt	2011-06-24 23:59:11 +02:00
Stephen F. Booth	39e8cbbefb	Added sampleFrames() to AIFFProperties and WAVProperties	2011-06-24 10:43:13 -04:00
Lukáš Lalinský	6b063862c3	Remove the old qmake project file, you can use CMake to build a framework now	2011-06-24 09:00:23 +02:00
Lukáš Lalinský	aec8880592	Update INSTALL to not mention the optional file formats and add info about building a framework	2011-06-24 08:59:38 +02:00
Lukáš Lalinský	dd846904cb	Remove the options to disable MP4/ASF support	2011-06-24 08:49:50 +02:00
Mathias Panzenböck	c7fd4cd2fc	IT: the max. 8000 bytes msg. length have to include the NUL	2011-06-24 01:53:20 +02:00
Mathias Panzenböck	57526c6c37	IT: add term. NUL to messages	2011-06-24 01:50:43 +02:00
Mathias Panzenböck	af92db9dc0	IT: unit tests	2011-06-24 01:31:15 +02:00
Mathias Panzenböck	2d6274a36a	Test FLAC: cleanup copied file	2011-06-24 01:21:17 +02:00
Mathias Panzenböck	9c27c45eb8	IT: strings require term. NUL. mod files: tableLength -> lengthInPatterns Also added enums for S3M/IT/XM flags.	2011-06-24 01:11:10 +02:00
Mathias Panzenböck	e71806b6df	IT: volume is only a byte in size	2011-06-23 20:48:04 +02:00
Lukáš Lalinský	0b34d4f8ee	Enable MP4/ASF by default	2011-06-23 20:18:38 +02:00
Mathias Panzenböck	26613473cf	forgot to remove debug code	2011-06-23 20:17:54 +02:00
Mathias Panzenböck	561cfdb0ec	S3M: unit tests and bug fixes (NUL char. is not optional in S3M strings)	2011-06-23 20:08:05 +02:00
Mathias Panzenböck	e810f2f61f	Merge branch 'master' of https://github.com/taglib/taglib	2011-06-23 17:40:36 +02:00
Mathias Panzenböck	7236ef4d0f	S3M+IT: fix reading, IT: untested support for message writing IT: reading was off starting with global volume because of wrong read size. S3M+IT: correctly read the number of used patterns. IT: fixed reading of message tag and implemented writing of message tag (not tested yet). I also added S3M+IT test files. TODO: Unit tests using them.	2011-06-23 05:41:23 +02:00
Anton Sergunov	b2517aa4a0	default constructor MP4::Tag::Tag()	2011-06-21 00:54:39 +07:00
Mathias Panzenböck	e202c658f0	Merge branch 'master' of https://github.com/taglib/taglib	2011-06-20 14:31:09 +02:00
Wolfgang Plaschg	7448bb353b	Include of "tag_c.h" after system libraries.	2011-06-20 03:08:24 +02:00
Mathias Panzenböck	aeb528ade2	XM: forgot smaple count	2011-06-20 02:31:17 +02:00
Mathias Panzenböck	d1cb8ae09d	IT: support channels property	2011-06-20 02:19:16 +02:00
Mathias Panzenböck	4b44f25048	comments++	2011-06-20 01:05:12 +02:00
Mathias Panzenböck	4b754b1bc6	more correct IT parsing and property naming	2011-06-20 00:43:42 +02:00
Mathias Panzenböck	b3d44394bf	more correct S3M parsing and property naming	2011-06-19 22:46:33 +02:00
Mathias Panzenböck	5477ede3ea	updated comments	2011-06-19 19:37:45 +02:00
Mathias Panzenböck	03534170fa	comments++	2011-06-19 19:35:27 +02:00
Mathias Panzenböck	b30b8c4ab5	IT: no longer allow wrong sample/instrument magic	2011-06-19 06:03:09 +02:00
Mathias Panzenböck	e09c2c5a19	untested(!) comment write support for s3m and it files	2011-06-19 05:42:16 +02:00
Mathias Panzenböck	6afb7c04b3	comment writing support and more tests for mod and xm	2011-06-19 04:27:51 +02:00
Mathias Panzenböck	0143c3ee63	comments++	2011-06-18 04:28:48 +02:00
Mathias Panzenböck	a31b0bcf8c	xm: no \n too much in comment if there are no samples	2011-06-18 03:38:18 +02:00
Mathias Panzenböck	5ad69f6f2a	fixed mod property names and added unit test for xm	2011-06-18 03:31:49 +02:00
Lukáš Lalinský	b63508ec3e	We still need these includes	2011-06-17 15:09:37 +04:00
Mathias Panzenböck	fe356c31b4	added unit test for one flavour of .mod files	2011-06-17 05:18:49 +02:00
Mathias Panzenböck	eec5e33e0d	added check for readOnly in save methods	2011-06-14 15:34:16 +02:00
Mathias Panzenböck	868ce3dd21	added myself to AUTHORS	2011-06-14 15:23:11 +02:00
Mathias Panzenböck	1e6d645ce9	fixed a comment	2011-06-14 03:56:32 +02:00
Mathias Panzenböck	65fb9733b9	added mod (+aliases) to defaultFileExtensions	2011-06-14 03:49:33 +02:00
Mathias Panzenböck	f75f5ac9bb	added .mod file support	2011-06-14 03:47:08 +02:00
Mathias Panzenböck	812826fe3a	Mod::File -> Mod::FileBase	2011-06-14 01:47:07 +02:00
Mathias Panzenböck	3192334006	more indentation fixes	2011-06-14 01:30:54 +02:00
Mathias Panzenböck	9b2bb4af34	code formatting fixes	2011-06-14 01:18:38 +02:00
Mathias Panzenböck	54e9656474	converted tabs to spaces	2011-06-14 01:09:55 +02:00
Mathias Panzenböck	f6dbd32ed3	refactored for ABI compat and write support of some tags of s3m/it/xm files tags that can be written: * s3m: title * it: title * xm: title, trackerName	2011-06-14 00:46:23 +02:00
Mathias Panzenböck	5332fb5cf8	added read-only support for s3m, it and xm	2011-06-13 03:19:21 +02:00
Lukáš Lalinský	c3c88b4f55	Merge remote branch 'lalinsky/abstract-io'	2011-06-09 18:58:45 +02:00
Lukáš Lalinský	8eb32577bd	Merge branch 'abstract-io'	2011-06-09 18:58:05 +02:00
Lukáš Lalinský	0ed2477dfa	Add an empty default implementation of IOStream::clear()	2011-06-09 18:52:48 +02:00
Frank Lai	b3646a0734	Be more careful when parsing Vorbis Comments	2011-06-09 18:44:54 +02:00
Frank Lai	8ed9b0da2c	Support for reading ALAC audio properties	2011-06-09 18:41:43 +02:00
Frank Lai	93564a2daa	ALAC file encoded by iTunes	2011-06-09 18:40:22 +02:00
Lukáš Lalinský	0a790f0017	Add a (failing) test for reading ALAC audio properties	2011-06-08 19:03:43 +02:00
Lukáš Lalinský	a224e7cd6d	Install the new headers	2011-05-28 22:06:41 +02:00
Lukáš Lalinský	088dbfa832	Merge remote branch 'taglib/master' into abstract-io	2011-05-28 22:04:07 +02:00
Stephen F. Booth	a04da3f159	Added read-only support to FileStream	2011-05-28 13:29:06 -04:00
Lukáš Lalinský	dc062a0844	Make RefCounter compile on OS X with the 10.4 SDK The 10.4 SDK defines OSAtomic functions as int32_t, while 10.5 and newer SDKs define them as volatile int32_t. This caused a compilation error when compiling against the 10.4 SDK. I'd have prefered a preprocessor-based solution, but I couldn't find any macro that says the SDK version, so I copied this cast solution from Apple's WebKit. I assume then know what they are doing if they have to workaround their own API. :)	2011-05-15 00:07:29 +02:00
Scott Wheeler	efeccbf726	Don't lead the scanned blocks on save	2011-05-09 19:06:08 +02:00
Lukáš Lalinský	6b7ed4a5d5	Merge pull request #2 from wplaschg/master Added ignore rules for MSVC 2008 build results	2011-05-09 10:02:21 -07:00
Wolfgang Plaschg	adb0984c87	Adding ignore rules for MSVC 2008 build results	2011-05-09 16:23:38 +02:00
Lukáš Lalinský	a38d2b2995	Simplify static builds	2011-05-08 15:57:34 +02:00
Lukáš Lalinský	b5b8387aee	Don't install pkg-config files when building a framework	2011-05-08 15:50:44 +02:00
Lukáš Lalinský	c337694165	Make it possible to build an OS X framework	2011-05-08 15:46:19 +02:00
Lukáš Lalinský	b2e3a477e9	Always make a copy of the ID3v1 genre name strings http://thread.gmane.org/gmane.comp.kde.devel.taglib/1876	2011-05-02 22:41:01 +02:00
Lukáš Lalinský	81734919d2	Add info about BUILD_EXAMPLES to the INSTALL file	2011-04-19 12:45:11 +02:00
Lukáš Lalinský	d03ef3c312	Use the PUBLIC_HEADER property to prepare for building an OS X framework	2011-04-18 16:52:47 +02:00
Lukáš Lalinský	e92ed0a830	Remove unnecessary code from tfile.cpp	2011-04-12 14:35:31 +02:00
Lukáš Lalinský	65ca29b3e2	Add a ByteVector-backed stream class	2011-04-12 14:28:02 +02:00
Lukáš Lalinský	26c130c387	Duplicate contructors of File subclasses to accept IOStream*	2011-04-11 23:31:44 +02:00
Lukáš Lalinský	8b59bb5957	Make it possible to actually pass a IOStream instance to File	2011-04-11 23:15:46 +02:00
Lukáš Lalinský	b53a577e38	Add FileStream as a copy of File's methods	2011-04-11 23:12:58 +02:00
Lukáš Lalinský	0b0cbc2e34	Add an abstract IOStream class	2011-04-11 22:46:56 +02:00
Lukáš Lalinský	4cda0eeb7b	Make it possible to run the test suite out of the source tree	2011-04-11 18:32:40 +02:00
Lukáš Lalinský	2fa8c93776	The website has more up-to-date links	2011-04-09 20:15:00 +02:00
Lukáš Lalinský	266200d77e	Add myself to the AUTHORS file	2011-04-09 20:09:51 +02:00
Lukáš Lalinský	aa84b8b674	Obsolete comment now that we are not in kdesupport	2011-04-09 20:07:15 +02:00
Lukáš Lalinský	ee920a461c	Clean up the library CMakeLists.txt file	2011-04-09 20:05:50 +02:00
Lukáš Lalinský	1596dc7c69	Clean up the main CMakeLists.txt file	2011-04-09 19:51:23 +02:00
Lukáš Lalinský	f3d3af9355	Don't set unnecessary compiler options	2011-04-09 19:42:56 +02:00
Lukáš Lalinský	9653796640	Merge branch 'master' of github.com:taglib/taglib	2011-04-09 19:19:49 +02:00
Lukáš Lalinský	a4a097d2f8	Merge branch 'stable'	2011-04-09 19:16:01 +02:00
Lukáš Lalinský	5eda17aa96	NEWS entries	2011-04-06 00:08:42 +02:00
Lukáš Lalinský	8878c9158c	Upgrade IPLS (2.3) to TIPL (2.4)	2011-04-05 17:08:25 +02:00
Lukáš Lalinský	3715b96477	Protect against incorrect ID3v2 version parameter	2011-04-05 15:36:23 +02:00
Lukáš Lalinský	aa57db3a39	Convert frames TIPL and TMCL (2.4) to IPLS (2.3)	2011-04-05 15:16:17 +02:00
Lukáš Lalinský	f9d38129b8	Merge branch 'master' into id3v23	2011-04-05 14:37:36 +02:00
Lukáš Lalinský	0c6e2a0aa9	NEWS entry	2011-03-30 09:19:25 +02:00
Martijn van Rheenen	e16829190a	Fix DRM detection in WMA files	2011-03-30 09:15:28 +02:00
Lukáš Lalinský	7a6647cb99	Untested version of DRM checking in WMA files	2011-03-29 15:49:24 +02:00
Lukáš Lalinský	97cd58bc65	Check for the presence of the drms atom in MP4 files	2011-03-29 15:41:17 +02:00
M.A. Brand Consulting	8f42d5b594	Make it possible to build a static version of the C bindings https://bugs.kde.org/show_bug.cgi?id=268441	2011-03-19 08:28:35 +01:00
Lukáš Lalinský	158152cb46	Use the same SO versioning as we had with automake/libtool http://article.gmane.org/gmane.comp.kde.devel.taglib/1826	2011-03-19 08:18:34 +01:00
Lukáš Lalinský	71e224fed8	Don't overwrite fields that already exist We can have multiple fields in the Vorbis Comment (e.g. two artist names), but TagUnion only takes the first one, so it will effectively strip the extra fields. https://bugs.kde.org/show_bug.cgi?id=268854	2011-03-19 07:37:28 +01:00
Lukáš Lalinský	80decd737d	Define NOMINMAX so that windows.h doesn't define it's own versions http://article.gmane.org/gmane.comp.kde.devel.taglib/1833 http://www.devx.com/tips/Tip/14540	2011-03-19 07:26:55 +01:00
Lukáš Lalinský	d169a670e0	Merge branch 'master' into id3v23	2011-03-17 09:16:29 +01:00
Scott Wheeler	a6cb74ad5d	Ignore docs and OS X dylibs	2011-03-17 08:01:33 +01:00
Scott Wheeler	27aa8cc293	These aren't needed anymore now that we're not in kdesupport	2011-03-17 07:57:24 +01:00
Lukáš Lalinský	d3df66f196	Convert TDRC to TYER+TDAT+TIME	2011-03-16 22:54:58 +01:00
Lukáš Lalinský	1453a7b157	Clean-up temporary files	2011-03-16 17:19:11 +01:00
Lukáš Lalinský	e8d0551c9a	Simple ID3v2.4 => ID3v2.3 frame migration	2011-03-16 17:14:36 +01:00
Lukáš Lalinský	061b381ea8	Make sure we don't write UTF8 or UTF16BE to ID3v2.3 tags	2011-03-15 21:57:49 +01:00
Lukáš Lalinský	1802237c75	Support for writing structuraly correct ID3v2.3 tags We don't use the tag footer, extended header or unsynchronization, so we only need to change the frame size format. Note that this doesn't write correct ID3v2.3 tags, just tags that have the correct structure. The content is sill incorrect, unless you add the right frames manually to the tag instance.	2011-03-15 20:50:47 +01:00
Lukáš Lalinský	4bdcc9662e	Partial protection against broken WMA files This fixes the problem on the reported file, but in general this code needs a lot more checks. https://bugs.kde.org/show_bug.cgi?id=268401	2011-03-13 21:33:57 +01:00
Lukáš Lalinský	41f1828719	Use the memory barrier variants on OS X	2011-03-12 23:21:54 +01:00
Lukáš Lalinský	223b85d345	Use GCC automic builtins where possible	2011-03-12 23:19:01 +01:00
Lukáš Lalinský	ee49b781eb	Add .gitignore	2011-03-11 15:16:05 +01:00
Lukáš Lalinský	065fcd5077	Merge branch 'release-1.7'	2011-03-11 14:16:11 +01:00
Nick Shaforostoff	38219b88b3	ups, revert my accidentally commited debug output git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1224409 283d02a7-25f6-0310-bc7c-ecb5cbfe19da	2011-03-10 17:30:22 +00:00
Nick Shaforostoff	0cdfa793e9	use atomic refcounting on mac and win32, todo for linux git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@1224407 283d02a7-25f6-0310-bc7c-ecb5cbfe19da	2011-03-10 17:29:30 +00:00
				`@@ -1 +0,0 @@`
				`#include "../taglib/riff/aiff/aiffproperties.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/frames/commentsframe.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v1/id3v1genres.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/id3v2footer.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/id3v2frame.h"`
				`@@ -1 +0,0 @@`
				`#include "../taglib/mpeg/id3v2/id3v2header.h"`