Changelog

Use the default frame factory when it's necessary to parse ID3v2 tags in APE files
https://bugs.kde.org/show_bug.cgi?id=278773
2026-06-07 14:59:24 -04:00 · 2012-07-11 12:31:00 +02:00 · 2012-07-11 12:29:14 +02:00 · 2012-04-20 17:57:13 +02:00 · 2012-04-20 17:52:12 +02:00 · 2012-03-18 09:20:26 +01:00
239 changed files with 1274 additions and 6735 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,41 +0,0 @@
-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,15 +1,11 @@
 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,93 +2,81 @@ project(taglib)

 cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)

-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(ENABLE_STATIC "Make static version of libtag"  OFF)

-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(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)

 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(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)
+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(APPLE)
-	option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
-	set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to.")
-endif()
+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(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_MAJOR_VERSION "1")
+SET(TAGLIB_LIB_MINOR_VERSION "7")
+SET(TAGLIB_LIB_PATCH_VERSION "2")

-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}")

-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 AND NOT BUILD_FRAMEWORK)
+if(NOT WIN32)
  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc )
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-endif()
-
+endif(NOT WIN32)
 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()
+endif(WITH_ASF)
 if(WITH_MP4)
    set(TAGLIB_WITH_MP4 TRUE)
-endif()
+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)

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

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

-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
+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)
 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,3 +1,8 @@
+# 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)
@@ -6,18 +11,18 @@ include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)

-# 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()
+#check for libz using the cmake supplied FindZLIB.cmake
+FIND_PACKAGE(ZLIB)

-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()
+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(NOT CppUnit_FOUND AND BUILD_TESTS)
--- a/30
+++ b/30
@@ -9,31 +9,10 @@ This can be done using the following commands:
  make
  sudo make install

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

-  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
----------
+  cmake -DWITH_MP4=ON -DWITH_ASF=ON [...]

 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
@@ -41,3 +20,6 @@ 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/23
+++ b/23
@@ -1,10 +1,23 @@
-TagLib 1.8 (In Development)
+TagLib 1.7.3 (Jul 12, 2012)
 ===========================

- * 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).
+ * Fixed crash when parsing ID3v2 tags from APE files (BUG:278773).
+
+TagLib 1.7.2 (Apr 20, 2012)
+===========================
+
+ * Fixed division by zero while parsing corrupted MP4 files (CVE-2012-2396).
+ * Fixed compilation on Haiku.
+
+TagLib 1.7.1 (Mar 17, 2012)
+===========================
+
+ * Improved parsing of corrupted WMA, RIFF and OGG files.
+ * Fixed a memory leak in the WMA parser.
+ * Fixed a memory leak in the FLAC parser.
+ * Fixed a possible division by zero in the APE parser.
+ * Added detection of TTA2 files.
+ * Fixed saving of multiple identically named tags to Vorbis Comments.

 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:

-http://developer.kde.org/~wheeler/taglib.html#bindings
-
+- Ruby - http://www.hakubi.us/ruby-taglib/
+- Python - http://namingmuse.berlios.de/
--- 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)

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

-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()
+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 )

 # 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,29 +40,27 @@ 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()
-  target_link_libraries(tag_c ${ROGUEWAVE_STDCXX_LIBRARY} Crun)
-endif()
+  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)

-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
-	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+  )
+INSTALL(TARGETS tag_c
 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
+	ARCHIVE DESTINATION  ${LIB_INSTALL_DIR}
 )

-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,6 +23,8 @@
 #include "config.h"
 #endif

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

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

 static List<char *> strings;
@@ -86,10 +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 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
@@ -1,21 +0,0 @@
-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
@@ -0,0 +1,16 @@
+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
@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aifffile.h"
--- a/include/aiffproperties.h
+++ b/include/aiffproperties.h
@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aiffproperties.h"
--- a/include/apefooter.h
+++ b/include/apefooter.h
@@ -0,0 +1 @@
+#include "../taglib/ape/apefooter.h"
--- a/include/apeitem.h
+++ b/include/apeitem.h
@@ -0,0 +1 @@
+#include "../taglib/ape/apeitem.h"
--- a/include/apetag.h
+++ b/include/apetag.h
@@ -0,0 +1 @@
+#include "../taglib/ape/apetag.h"
--- a/include/asfattribute.h
+++ b/include/asfattribute.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asfattribute.h"
--- a/include/asffile.h
+++ b/include/asffile.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asffile.h"
--- a/include/asfproperties.h
+++ b/include/asfproperties.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asfproperties.h"
--- a/include/asftag.h
+++ b/include/asftag.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asftag.h"
--- a/include/attachedpictureframe.h
+++ b/include/attachedpictureframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"
--- a/include/audioproperties.h
+++ b/include/audioproperties.h
@@ -0,0 +1 @@
+#include "../taglib/audioproperties.h"
--- a/include/commentsframe.h
+++ b/include/commentsframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/commentsframe.h"
--- a/include/fileref.h
+++ b/include/fileref.h
@@ -0,0 +1 @@
+#include "../taglib/fileref.h"
--- a/include/flacfile.h
+++ b/include/flacfile.h
@@ -0,0 +1 @@
+#include "../taglib/flac/flacfile.h"
--- a/include/flacproperties.h
+++ b/include/flacproperties.h
@@ -0,0 +1 @@
+#include "../taglib/flac/flacproperties.h"
--- a/include/generalencapsulatedobjectframe.h
+++ b/include/generalencapsulatedobjectframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"
--- a/include/id3v1genres.h
+++ b/include/id3v1genres.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1genres.h"
--- a/include/id3v1tag.h
+++ b/include/id3v1tag.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1tag.h"
--- a/include/id3v2extendedheader.h
+++ b/include/id3v2extendedheader.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"
--- a/include/id3v2footer.h
+++ b/include/id3v2footer.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2footer.h"
--- a/include/id3v2frame.h
+++ b/include/id3v2frame.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2frame.h"
--- a/include/id3v2framefactory.h
+++ b/include/id3v2framefactory.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2framefactory.h"
--- a/include/id3v2header.h
+++ b/include/id3v2header.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2header.h"
--- a/include/id3v2synchdata.h
+++ b/include/id3v2synchdata.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2synchdata.h"
--- a/include/id3v2tag.h
+++ b/include/id3v2tag.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2tag.h"
--- a/include/mp4atom.h
+++ b/include/mp4atom.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4atom.h"
--- a/include/mp4coverart.h
+++ b/include/mp4coverart.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4coverart.h"
--- a/include/mp4file.h
+++ b/include/mp4file.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4file.h"
--- a/include/mp4item.h
+++ b/include/mp4item.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4item.h"
--- a/include/mp4properties.h
+++ b/include/mp4properties.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4properties.h"
--- a/include/mp4tag.h
+++ b/include/mp4tag.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4tag.h"
--- a/include/mpcfile.h
+++ b/include/mpcfile.h
@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcfile.h"
--- a/include/mpcproperties.h
+++ b/include/mpcproperties.h
@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcproperties.h"
--- a/include/mpegfile.h
+++ b/include/mpegfile.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegfile.h"
--- a/include/mpegheader.h
+++ b/include/mpegheader.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegheader.h"
--- a/include/mpegproperties.h
+++ b/include/mpegproperties.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegproperties.h"
--- a/include/oggfile.h
+++ b/include/oggfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/oggfile.h"
--- a/include/oggflacfile.h
+++ b/include/oggflacfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/flac/oggflacfile.h"
--- a/include/oggpage.h
+++ b/include/oggpage.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpage.h"
--- a/include/oggpageheader.h
+++ b/include/oggpageheader.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpageheader.h"
--- a/include/popularimeterframe.h
+++ b/include/popularimeterframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/popularimeterframe.h"
--- a/include/privateframe.h
+++ b/include/privateframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/privateframe.h"
--- a/include/relativevolumeframe.h
+++ b/include/relativevolumeframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/relativevolumeframe.h"
--- a/include/rifffile.h
+++ b/include/rifffile.h
@@ -0,0 +1 @@
+#include "../taglib/riff/rifffile.h"
--- a/include/speexfile.h
+++ b/include/speexfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexfile.h"
--- a/include/speexproperties.h
+++ b/include/speexproperties.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexproperties.h"
--- a/include/tag.h
+++ b/include/tag.h
@@ -0,0 +1 @@
+#include "../taglib/tag.h"
--- a/include/taglib.h
+++ b/include/taglib.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/taglib.h"
--- a/include/taglib_export.h
+++ b/include/taglib_export.h
@@ -0,0 +1 @@
+#include "../taglib/taglib_export.h"
--- a/include/tagunion.h
+++ b/include/tagunion.h
@@ -0,0 +1 @@
+#include "../taglib/tagunion.h"
--- a/include/tbytevector.h
+++ b/include/tbytevector.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevector.h"
--- a/include/tbytevectorlist.h
+++ b/include/tbytevectorlist.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevectorlist.h"
--- a/include/tdebug.h
+++ b/include/tdebug.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tdebug.h"
--- a/include/textidentificationframe.h
+++ b/include/textidentificationframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/textidentificationframe.h"
--- a/include/tfile.h
+++ b/include/tfile.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tfile.h"
--- a/include/tlist.h
+++ b/include/tlist.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tlist.h"
--- a/include/tmap.h
+++ b/include/tmap.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tmap.h"
--- a/include/trueaudiofile.h
+++ b/include/trueaudiofile.h
@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudiofile.h"
--- a/include/trueaudioproperties.h
+++ b/include/trueaudioproperties.h
@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudioproperties.h"
--- a/include/tstring.h
+++ b/include/tstring.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstring.h"
--- a/include/tstringlist.h
+++ b/include/tstringlist.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstringlist.h"
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/unicode.h"
--- a/include/uniquefileidentifierframe.h
+++ b/include/uniquefileidentifierframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h"
--- a/include/unknownframe.h
+++ b/include/unknownframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unknownframe.h"
--- a/include/unsynchronizedlyricsframe.h
+++ b/include/unsynchronizedlyricsframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h"
--- a/include/urllinkframe.h
+++ b/include/urllinkframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/urllinkframe.h"
--- a/include/vorbisfile.h
+++ b/include/vorbisfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisfile.h"
--- a/include/vorbisproperties.h
+++ b/include/vorbisproperties.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisproperties.h"
--- a/include/wavfile.h
+++ b/include/wavfile.h
@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavfile.h"
--- a/include/wavpackfile.h
+++ b/include/wavpackfile.h
@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackfile.h"
--- a/include/wavpackproperties.h
+++ b/include/wavpackproperties.h
@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackproperties.h"
--- a/include/wavproperties.h
+++ b/include/wavproperties.h
@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavproperties.h"
--- a/include/xingheader.h
+++ b/include/xingheader.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/xingheader.h"
--- a/include/xiphcomment.h
+++ b/include/xiphcomment.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/xiphcomment.h"
--- a/taglib/CMakeLists.txt
+++ b/taglib/CMakeLists.txt
@@ -1,317 +1,219 @@
+
 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_SOURCE_DIR}/mod
-  ${CMAKE_CURRENT_SOURCE_DIR}/s3m
-  ${CMAKE_CURRENT_SOURCE_DIR}/it
-  ${CMAKE_CURRENT_SOURCE_DIR}/xm
+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}/..
 )
-
 if(ZLIB_FOUND)
-  include_directories(${ZLIB_INCLUDE_DIR})
-endif()
+    INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
+endif(ZLIB_FOUND)

-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
+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(mpeg_SRCS
-  mpeg/mpegfile.cpp
-  mpeg/mpegproperties.cpp
-  mpeg/mpegheader.cpp
-  mpeg/xingheader.cpp
+SET(id3v1_SRCS
+mpeg/id3v1/id3v1tag.cpp
+mpeg/id3v1/id3v1genres.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(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
 )

-set(mp4_SRCS
-  mp4/mp4file.cpp
-  mp4/mp4atom.cpp
-  mp4/mp4tag.cpp
-  mp4/mp4item.cpp
-  mp4/mp4properties.cpp
-  mp4/mp4coverart.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(ape_SRCS
-  ape/apetag.cpp
-  ape/apefooter.cpp
-  ape/apeitem.cpp
-  ape/apefile.cpp
-  ape/apeproperties.cpp
+SET(wavpack_SRCS
+wavpack/wavpackfile.cpp
+wavpack/wavpackproperties.cpp
 )

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

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

-set(trueaudio_SRCS
-  trueaudio/trueaudiofile.cpp
-  trueaudio/trueaudioproperties.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(asf_SRCS
-  asf/asftag.cpp
-  asf/asffile.cpp
-  asf/asfproperties.cpp
-  asf/asfattribute.cpp
-  asf/asfpicture.cpp
+SET(aiff_SRCS
+riff/aiff/aifffile.cpp
+riff/aiff/aiffproperties.cpp
 )

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

-set(aiff_SRCS
-  riff/aiff/aifffile.cpp
-  riff/aiff/aiffproperties.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(wav_SRCS
-  riff/wav/wavfile.cpp
-  riff/wav/wavproperties.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(mod_SRCS
-  mod/modfilebase.cpp
-  mod/modfile.cpp
-  mod/modtag.cpp
-  mod/modproperties.cpp
-)

-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})
+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)

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

-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}"
+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 ""
 )
-if(BUILD_FRAMEWORK)
-  set_target_properties(tag PROPERTIES FRAMEWORK TRUE)
-endif()
-
-install(TARGETS tag
-	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+INSTALL(TARGETS tag
 	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
 	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
+	ARCHIVE DESTINATION  ${LIB_INSTALL_DIR}
 )

+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
@@ -0,0 +1 @@
+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,13 +92,6 @@ 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,14 +91,6 @@ 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/ape/apefooter.cpp
+++ b/taglib/ape/apefooter.cpp
@@ -24,7 +24,7 @@
 *   http://www.mozilla.org/MPL/                                           *
 ***************************************************************************/

-#include <ostream>
+#include <iostream>
 #include <bitset>

 #include <tstring.h>
--- a/taglib/ape/apeproperties.cpp
+++ b/taglib/ape/apeproperties.cpp
@@ -137,7 +137,7 @@ long APE::Properties::findDescriptor()
  long ID3v2OriginalSize = 0;
  bool hasID3v2 = false;
  if(ID3v2Location >= 0) {
-    ID3v2::Tag tag(d->file, ID3v2Location, 0);
+    ID3v2::Tag tag(d->file, ID3v2Location);
    ID3v2OriginalSize = tag.header()->completeTagSize();
    if(tag.header()->tagSize() > 0)
      hasID3v2 = true;
@@ -193,7 +193,7 @@ void APE::Properties::analyzeCurrent()
  uint blocksPerFrame = header.mid(4, 4).toUInt(false);
  uint finalFrameBlocks = header.mid(8, 4).toUInt(false);
  uint totalBlocks = totalFrames > 0 ? (totalFrames -  1) * blocksPerFrame + finalFrameBlocks : 0;
-  d->length = totalBlocks / d->sampleRate;
+  d->length = d->sampleRate > 0 ? totalBlocks / d->sampleRate : 0;
  d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
 }

--- a/taglib/asf/CMakeLists.txt
+++ b/taglib/asf/CMakeLists.txt
@@ -0,0 +1 @@
+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,6 +27,8 @@
 #include <config.h>
 #endif

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

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

+#ifdef WITH_ASF
+
 #include <tdebug.h>
 #include <tbytevectorlist.h>
 #include <tstring.h>
@@ -67,9 +69,6 @@ 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
 {
@@ -142,11 +141,19 @@ class ASF::File::HeaderExtensionObject : public ASF::File::BaseObject
 {
 public:
  List<ASF::File::BaseObject *> objects;
+  ~HeaderExtensionObject();
  ByteVector guid();
  void parse(ASF::File *file, uint size);
  ByteVector render(ASF::File *file);
 };

+ASF::File::HeaderExtensionObject::~HeaderExtensionObject()
+{
+  for(unsigned int i = 0; i < objects.size(); i++) {
+    delete objects[i];
+  }
+}
+
 void ASF::File::BaseObject::parse(ASF::File *file, unsigned int size)
 {
  data.clear();
@@ -367,13 +374,6 @@ 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++) {
@@ -454,11 +454,6 @@ 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);
@@ -605,3 +600,4 @@ ByteVector ASF::File::renderString(const String &str, bool includeLength)
  return data;
 }

+#endif
--- a/taglib/asf/asffile.h
+++ b/taglib/asf/asffile.h
@@ -57,16 +57,6 @@ 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,6 +27,8 @@
 #include <config.h>
 #endif

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

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

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

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

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

-void ASF::Properties::setEncrypted(bool encrypted)
-{
-  d->encrypted = encrypted;
-}
-
+#endif
--- a/taglib/asf/asfproperties.h
+++ b/taglib/asf/asfproperties.h
@@ -54,14 +54,12 @@ 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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukáš Lalinský	fddf3ed51b	Changelog	2012-07-11 12:31:00 +02:00
Jonathan Liu	e2bdbb2cd1	Use the default frame factory when it's necessary to parse ID3v2 tags in APE files https://bugs.kde.org/show_bug.cgi?id=278773	2012-07-11 12:29:14 +02:00
Lukáš Lalinský	059f2243b3	Prepare 1.7.2 release	2012-04-20 17:57:13 +02:00
Lukáš Lalinský	cce6ad46c9	Reverse the version check, similarly to what mp4v2 does	2012-04-20 17:52:12 +02:00
scottmc	288c6e4a3f	Include <iostream> instead of <ostream> to fix compilation on Haiku	2012-03-18 09:20:26 +01:00
Lukáš Lalinský	606edf8171	Increment the version number	2012-03-17 11:02:24 +01:00
Lukáš Lalinský	009c43952f	Changelog	2012-03-17 10:58:22 +01:00
Birunthan Mohnathas	9c1668f28b	Fixed (huge) memory leak with ASF.	2012-03-17 10:48:57 +01:00
Lukáš Lalinský	110cac8429	Avoid uint overflow in case the length + index is over UINT_MAX	2012-03-10 09:13:04 +01:00
Lukáš Lalinský	258ae751b5	Don't store the output of ByteVector::toUInt() in int, use uint instead	2012-03-10 09:12:32 +01:00
Lukáš Lalinský	df1d3e028e	Make sure to not try dividing by zero	2012-03-10 09:12:19 +01:00
Stephen F. Booth	23c86cf27d	Check if the header is TTA1 before parsing	2012-03-10 09:11:51 +01:00
Lukáš Lalinský	f59c3b67aa	Detect RIFF files with invalid chunk sizes The bug report has a WAVE file with zero-sized 'data' chunk, which causes TagLib to iterate over the file, 8 bytes in each iteration. The new code adds a check for the chunk name, which forces it to mark the file as invalid if the chunk name doesn't contain ASCII characters. https://bugs.kde.org/show_bug.cgi?id=283412	2012-03-10 09:06:55 +01:00
Stephen F. Booth	294cb22241	Don't crash when wav files have a 0 for bit per channel (sampleWidth) I've seen this in a wav that has an audio format of MP3 (0x55)	2012-03-10 08:58:45 +01:00
Frank Lai	b7ec0d26ab	Be more careful when parsing Vorbis Comments	2012-03-10 08:52:59 +01:00
Scott Wheeler	934ce51790	Don't lead the scanned blocks on save	2012-03-10 08:52:17 +01:00
				`@@ -0,0 +1 @@`
				`#include "../taglib/riff/aiff/aiffproperties.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/frames/commentsframe.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v1/id3v1genres.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2footer.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2frame.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2header.h"`