Changelog

https://bugs.kde.org/show_bug.cgi?id=278773

.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

AUTHORS

@@ -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!

CMakeLists.txt

@@ -2,107 +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_RUNTIME "Visual Studio, link with runtime statically"  OFF)
+OPTION(ENABLE_STATIC "Make static version of libtag"  OFF)
 
-option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden"  OFF)
-if(VISIBILITY_HIDDEN)
-  add_definitions (-fvisibility=hidden)
-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(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()
-if (MSVC AND ENABLE_STATIC_RUNTIME)
-  foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-  endforeach(flag_var)
-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 "8")
-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  12)
-set(TAGLIB_SOVERSION_REVISION 0)
-set(TAGLIB_SOVERSION_AGE      11)
-
-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)
-if(BUILD_TESTS)
-    enable_testing()
-    add_subdirectory(tests)
-endif(BUILD_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")

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)

INSTALL

@@ -9,62 +9,17 @@ 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 [...]
+  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
+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.
 
-Mac OS X
---------
-
-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;i386;x86_64"
-
-For a 10.6 Snow Leopard static library with both 32-bit and 64-bit code, use:
-
-  cmake -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_OSX_DEPLOYMENT_TARGET=10.6 \
-    -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
-    -DENABLE_STATIC=ON \
-    -DCMAKE_INSTALL_PREFIX="<folder you want to build to>"
-
-After 'make', and 'make install', add libtag.a to your XCode project, and add
-the include folder to the project's User Header Search Paths.
-
-Windows
--------
-
-For building a static library on Windows with Visual Studio 2010, cd to
-the TagLib folder then:
-
-  cmake -DENABLE_STATIC=ON -DENABLE_STATIC_RUNTIME=ON -G "Visual Studio 10" ...
-  
-Including ENABLE_STATIC_RUNTIME=ON indicates you want TagLib built using the
-static runtime library, rather than the DLL form of the runtime.
-CMake will create a Visual Studio solution, taglib.sln that you can open and
-build as normal.  
-
-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. To build the tests, include
-the option -DBUILD_TESTS=on when running cmake.
-
-The test suite has a custom target in the build system, so you can run
-the tests using make:
-
-  make check
-

NEWS

@@ -1,20 +1,7 @@
-TagLib 1.8 BETA (Jul 14, 2012)
-==============================
+TagLib 1.7.3 (Jul 12, 2012)
+===========================
 
- * New API for accessing tags by name.
- * New abstract I/O stream layer to allow custom I/O handlers.
- * Support for writing ID3v2.3 tags.
- * Support for various module file formats (MOD, S3M, IT, XM).
- * Support for MP4 and ASF is now enabled by default.
- * Started using atomic int operations for reference counting.
- * Added methods for checking if WMA and MP4 files are DRM-protected.
- * Added taglib_free to the C bindings.
- * New method to allow removing pictures from FLAC files.
- * Support for reading audio properties from ALAC and Musepack SV8 files.
- * Added replay-gain information to Musepack audio properties.
- * Support for APEv2 binary tags.
- * Many AudioProperties subclasses now provide information about the total number of samples.
- * Various small bug fixes.
+ * Fixed crash when parsing ID3v2 tags from APE files (BUG:278773).
 
 TagLib 1.7.2 (Apr 20, 2012)
 ===========================

bindings/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(c) 
+ADD_SUBDIRECTORY( c ) 

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/

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)

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;
@@ -58,11 +58,6 @@ void taglib_set_string_management_enabled(BOOL management)
   stringManagementEnabled = bool(management);
 }
 
-void taglib_free(void* pointer)
-{
-  free(pointer);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // TagLib::File wrapper
 ////////////////////////////////////////////////////////////////////////////////
@@ -91,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;
   }
@@ -109,7 +108,7 @@ void taglib_file_free(TagLib_File *file)
 
 BOOL taglib_file_is_valid(const TagLib_File *file)
 {
-  return reinterpret_cast<const File *>(file)->isValid();
+	return reinterpret_cast<const File *>(file)->isValid();
 }
 
 TagLib_Tag *taglib_file_tag(const TagLib_File *file)

bindings/c/tag_c.h

@@ -79,11 +79,6 @@ TAGLIB_C_EXPORT void taglib_set_strings_unicode(BOOL unicode);
  */
 TAGLIB_C_EXPORT void taglib_set_string_management_enabled(BOOL management);
 
-/*!
- * Explicitly free a string returned from TagLib
- */
-TAGLIB_C_EXPORT void taglib_free(void* pointer);
-
 /*******************************************************************************
  * File API
  ******************************************************************************/
@@ -104,7 +99,7 @@ typedef enum {
 /*!
  * Creates a TagLib file based on \a filename.  TagLib will try to guess the file
  * type.
- *
+ * 
  * \returns NULL if the file type cannot be determined or the file cannot
  * be opened.
  */

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

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@"
-

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

include/aifffile.h

@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aifffile.h"

include/aiffproperties.h

@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aiffproperties.h"

include/apefooter.h

@@ -0,0 +1 @@
+#include "../taglib/ape/apefooter.h"

include/apeitem.h

@@ -0,0 +1 @@
+#include "../taglib/ape/apeitem.h"

include/apetag.h

@@ -0,0 +1 @@
+#include "../taglib/ape/apetag.h"

include/asfattribute.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asfattribute.h"

include/asffile.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asffile.h"

include/asfproperties.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asfproperties.h"

include/asftag.h

@@ -0,0 +1 @@
+#include "../taglib/asf/asftag.h"

include/attachedpictureframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"

include/audioproperties.h

@@ -0,0 +1 @@
+#include "../taglib/audioproperties.h"

include/commentsframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/commentsframe.h"

include/fileref.h

@@ -0,0 +1 @@
+#include "../taglib/fileref.h"

include/flacfile.h

@@ -0,0 +1 @@
+#include "../taglib/flac/flacfile.h"

include/flacproperties.h

@@ -0,0 +1 @@
+#include "../taglib/flac/flacproperties.h"

include/generalencapsulatedobjectframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"

include/id3v1genres.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1genres.h"

include/id3v1tag.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1tag.h"

include/id3v2extendedheader.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"

include/id3v2footer.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2footer.h"

include/id3v2frame.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2frame.h"

include/id3v2framefactory.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2framefactory.h"

include/id3v2header.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2header.h"

include/id3v2synchdata.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2synchdata.h"

include/id3v2tag.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2tag.h"

include/mp4atom.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4atom.h"

include/mp4coverart.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4coverart.h"

include/mp4file.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4file.h"

include/mp4item.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4item.h"

include/mp4properties.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4properties.h"

include/mp4tag.h

@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4tag.h"

include/mpcfile.h

@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcfile.h"

include/mpcproperties.h

@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcproperties.h"

include/mpegfile.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegfile.h"

include/mpegheader.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegheader.h"

include/mpegproperties.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegproperties.h"

include/oggfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/oggfile.h"

include/oggflacfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/flac/oggflacfile.h"

include/oggpage.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpage.h"

include/oggpageheader.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpageheader.h"

include/popularimeterframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/popularimeterframe.h"

include/privateframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/privateframe.h"

include/relativevolumeframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/relativevolumeframe.h"

include/rifffile.h

@@ -0,0 +1 @@
+#include "../taglib/riff/rifffile.h"

include/speexfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexfile.h"

include/speexproperties.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexproperties.h"

include/tag.h

@@ -0,0 +1 @@
+#include "../taglib/tag.h"

include/taglib.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/taglib.h"

include/taglib_export.h

@@ -0,0 +1 @@
+#include "../taglib/taglib_export.h"

include/tagunion.h

@@ -0,0 +1 @@
+#include "../taglib/tagunion.h"

include/tbytevector.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevector.h"

include/tbytevectorlist.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevectorlist.h"

include/tdebug.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tdebug.h"

include/textidentificationframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/textidentificationframe.h"

include/tfile.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tfile.h"

include/tlist.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tlist.h"

include/tmap.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tmap.h"

include/trueaudiofile.h

@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudiofile.h"

include/trueaudioproperties.h

@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudioproperties.h"

include/tstring.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstring.h"

include/tstringlist.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstringlist.h"

include/unicode.h

@@ -0,0 +1 @@
+#include "../taglib/toolkit/unicode.h"

include/uniquefileidentifierframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h"

include/unknownframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unknownframe.h"

include/unsynchronizedlyricsframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h"

include/urllinkframe.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/urllinkframe.h"

include/vorbisfile.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisfile.h"

include/vorbisproperties.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisproperties.h"

include/wavfile.h

@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavfile.h"

include/wavpackfile.h

@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackfile.h"

include/wavpackproperties.h

@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackproperties.h"

include/wavproperties.h

@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavproperties.h"

include/xingheader.h

@@ -0,0 +1 @@
+#include "../taglib/mpeg/xingheader.h"

include/xiphcomment.h

@@ -0,0 +1 @@
+#include "../taglib/ogg/xiphcomment.h"

taglib/CMakeLists.txt

@@ -1,319 +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
-  toolkit/tpropertymap.h
-  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/tpropertymap.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)

taglib/ape/CMakeLists.txt

@@ -0,0 +1 @@
+INSTALL( FILES apefile.h apeproperties.h apetag.h apefooter.h apeitem.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)

taglib/ape/apefile.cpp

@@ -36,7 +36,6 @@
 #include <tdebug.h>
 #include <tagunion.h>
 #include <id3v1tag.h>
-#include <tpropertymap.h>
 
 #include "apefile.h"
 
@@ -47,7 +46,7 @@ using namespace TagLib;
 
 namespace
 {
-  enum { ApeAPEIndex, ApeID3v1Index };
+  enum { APEIndex, ID3v1Index };
 }
 
 class APE::File::FilePrivate
@@ -93,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;
@@ -110,33 +102,6 @@ TagLib::Tag *APE::File::tag() const
   return &d->tag;
 }
 
-PropertyMap APE::File::properties() const
-{
-  if(d->hasAPE)
-    return d->tag.access<APE::Tag>(ApeAPEIndex, false)->properties();
-  if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(ApeID3v1Index, false)->properties();
-  return PropertyMap();
-}
-
-void APE::File::removeUnsupportedProperties(const StringList &properties)
-{
-  if(d->hasAPE)
-    d->tag.access<APE::Tag>(ApeAPEIndex, false)->removeUnsupportedProperties(properties);
-  if(d->hasID3v1)
-    d->tag.access<ID3v1::Tag>(ApeID3v1Index, false)->removeUnsupportedProperties(properties);
-}
-
-PropertyMap APE::File::setProperties(const PropertyMap &properties)
-{
-  if(d->hasAPE)
-    return d->tag.access<APE::Tag>(ApeAPEIndex, false)->setProperties(properties);
-  else if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(ApeID3v1Index, false)->setProperties(properties);
-  else
-    return d->tag.access<APE::Tag>(ApeAPEIndex, true)->setProperties(properties);
-}
-
 APE::Properties *APE::File::audioProperties() const
 {
   return d->properties;
@@ -213,23 +178,23 @@ bool APE::File::save()
 
 ID3v1::Tag *APE::File::ID3v1Tag(bool create)
 {
-  return d->tag.access<ID3v1::Tag>(ApeID3v1Index, create);
+  return d->tag.access<ID3v1::Tag>(ID3v1Index, create);
 }
 
 APE::Tag *APE::File::APETag(bool create)
 {
-  return d->tag.access<APE::Tag>(ApeAPEIndex, create);
+  return d->tag.access<APE::Tag>(APEIndex, create);
 }
 
 void APE::File::strip(int tags)
 {
   if(tags & ID3v1) {
-    d->tag.set(ApeID3v1Index, 0);
+    d->tag.set(ID3v1Index, 0);
     APETag(true);
   }
 
   if(tags & APE) {
-    d->tag.set(ApeAPEIndex, 0);
+    d->tag.set(APEIndex, 0);
 
     if(!ID3v1Tag())
       APETag(true);
@@ -247,7 +212,7 @@ void APE::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
   d->ID3v1Location = findID3v1();
 
   if(d->ID3v1Location >= 0) {
-    d->tag.set(ApeID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+    d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
     d->hasID3v1 = true;
   }
 
@@ -256,7 +221,7 @@ void APE::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
   d->APELocation = findAPE();
 
   if(d->APELocation >= 0) {
-    d->tag.set(ApeAPEIndex, new APE::Tag(this, d->APELocation));
+    d->tag.set(APEIndex, new APE::Tag(this, d->APELocation));
     d->APESize = APETag()->footer()->completeTagSize();
     d->APELocation = d->APELocation + APETag()->footer()->size() - d->APESize;
     d->hasAPE = true;

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.
        */
@@ -110,25 +102,6 @@ namespace TagLib {
        */
       virtual TagLib::Tag *tag() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * If the file contains both an APE and an ID3v1 tag, only APE
-       * will be converted to the PropertyMap.
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Removes unsupported properties. Forwards to the actual Tag's
-       * removeUnsupportedProperties() function.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * As for the export, only one tag is taken into account. If the file
-       * has no tag at all, APE will be created.
-       */
-      PropertyMap setProperties(const PropertyMap &);
       /*!
        * Returns the APE::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.

taglib/ape/apefooter.cpp

@@ -35,7 +35,7 @@
 using namespace TagLib;
 using namespace APE;
 
-class APE::Footer::FooterPrivate
+class Footer::FooterPrivate
 {
 public:
   FooterPrivate() : version(0),
@@ -64,12 +64,12 @@ public:
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-TagLib::uint APE::Footer::size()
+TagLib::uint Footer::size()
 {
   return FooterPrivate::size;
 }
 
-ByteVector APE::Footer::fileIdentifier()
+ByteVector Footer::fileIdentifier()
 {
   return ByteVector::fromCString("APETAGEX");
 }
@@ -78,63 +78,63 @@ ByteVector APE::Footer::fileIdentifier()
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Footer::Footer()
+Footer::Footer()
 {
   d = new FooterPrivate;
 }
 
-APE::Footer::Footer(const ByteVector &data)
+Footer::Footer(const ByteVector &data)
 {
   d = new FooterPrivate;
   parse(data);
 }
 
-APE::Footer::~Footer()
+Footer::~Footer()
 {
   delete d;
 }
 
-TagLib::uint APE::Footer::version() const
+TagLib::uint Footer::version() const
 {
   return d->version;
 }
 
-bool APE::Footer::headerPresent() const
+bool Footer::headerPresent() const
 {
   return d->headerPresent;
 }
 
-bool APE::Footer::footerPresent() const
+bool Footer::footerPresent() const
 {
   return d->footerPresent;
 }
 
-bool APE::Footer::isHeader() const
+bool Footer::isHeader() const
 {
   return d->isHeader;
 }
 
-void APE::Footer::setHeaderPresent(bool b) const
+void Footer::setHeaderPresent(bool b) const
 {
   d->headerPresent = b;
 }
 
-TagLib::uint APE::Footer::itemCount() const
+TagLib::uint Footer::itemCount() const
 {
   return d->itemCount;
 }
 
-void APE::Footer::setItemCount(uint s)
+void Footer::setItemCount(uint s)
 {
   d->itemCount = s;
 }
 
-TagLib::uint APE::Footer::tagSize() const
+TagLib::uint Footer::tagSize() const
 {
   return d->tagSize;
 }
 
-TagLib::uint APE::Footer::completeTagSize() const
+TagLib::uint Footer::completeTagSize() const
 {
   if(d->headerPresent)
     return d->tagSize + d->size;
@@ -142,22 +142,22 @@ TagLib::uint APE::Footer::completeTagSize() const
     return d->tagSize;
 }
 
-void APE::Footer::setTagSize(uint s)
+void Footer::setTagSize(uint s)
 {
   d->tagSize = s;
 }
 
-void APE::Footer::setData(const ByteVector &data)
+void Footer::setData(const ByteVector &data)
 {
   parse(data);
 }
 
-ByteVector APE::Footer::renderFooter() const
+ByteVector Footer::renderFooter() const
 {
     return render(false);
 }
 
-ByteVector APE::Footer::renderHeader() const
+ByteVector Footer::renderHeader() const
 {
     if (!d->headerPresent) return ByteVector();
 
@@ -168,7 +168,7 @@ ByteVector APE::Footer::renderHeader() const
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::Footer::parse(const ByteVector &data)
+void Footer::parse(const ByteVector &data)
 {
   if(data.size() < size())
     return;
@@ -197,7 +197,7 @@ void APE::Footer::parse(const ByteVector &data)
 
 }
 
-ByteVector APE::Footer::render(bool isHeader) const
+ByteVector Footer::render(bool isHeader) const
 {
   ByteVector v;
 

taglib/ape/apeitem.cpp

@@ -62,18 +62,6 @@ APE::Item::Item(const String &key, const StringList &values)
   d->text = values;
 }
 
-APE::Item::Item(const String &key, const ByteVector &value, bool binary)
-{
-  d = new ItemPrivate;
-  d->key = key;
-  if(binary) {
-    d->type = Binary;
-    d->value = value;
-  }
-  else
-    d->text.append(value);
-}
-
 APE::Item::Item(const Item &item)
 {
   d = new ItemPrivate(*item.d);
@@ -116,17 +104,6 @@ String APE::Item::key() const
   return d->key;
 }
 
-ByteVector APE::Item::binaryData() const
-{
-  return d->value;
-}
-
-void APE::Item::setBinaryData(const ByteVector &value)
-{
-  d->type = Binary;
-  d->value = value;
-}
-
 ByteVector APE::Item::value() const
 {
   // This seems incorrect as it won't be actually rendering the value to keep it
@@ -142,50 +119,27 @@ void APE::Item::setKey(const String &key)
 
 void APE::Item::setValue(const String &value)
 {
-    d->type = Text;
     d->text = value;
 }
 
 void APE::Item::setValues(const StringList &value)
 {
-    d->type = Text;
     d->text = value;
 }
 
 void APE::Item::appendValue(const String &value)
 {
-    d->type = Text;
     d->text.append(value);
 }
 
 void APE::Item::appendValues(const StringList &values)
 {
-    d->type = Text;
     d->text.append(values);
 }
 
 int APE::Item::size() const
 {
-  // SFB: Why is d->key.size() used when size() returns the length in UniChars and not UTF-8?
-  int result = 8 + d->key.size() /* d->key.data(String::UTF8).size() */ + 1;
-  switch (d->type) {
-    case Text:
-      if(d->text.size()) {
-        StringList::ConstIterator it = d->text.begin();
-
-        result += it->data(String::UTF8).size();
-        it++;
-        for(; it != d->text.end(); ++it)
-          result += 1 + it->data(String::UTF8).size();
-      }
-      break;
-
-    case Binary:
-    case Locator:
-      result += d->value.size();
-      break;
-  }
-  return result;
+  return 8 + d->key.size() + 1 + d->value.size();
 }
 
 StringList APE::Item::toStringList() const
@@ -207,12 +161,12 @@ bool APE::Item::isEmpty() const
 {
   switch(d->type) {
     case Text:
+    case Binary:
       if(d->text.isEmpty())
         return true;
       if(d->text.size() == 1 && d->text.front().isEmpty())
         return true;
       return false;
-    case Binary:
     case Locator:
       return d->value.isEmpty();
     default:
@@ -239,7 +193,7 @@ void APE::Item::parse(const ByteVector &data)
   setReadOnly(flags & 1);
   setType(ItemTypes((flags >> 1) & 3));
 
-  if(Text == d->type)
+  if(int(d->type) < 2)
     d->text = StringList(ByteVectorList::split(d->value, '\0'), String::UTF8);
 }
 

taglib/ape/apeitem.h

@@ -59,22 +59,16 @@ namespace TagLib {
       Item();
 
       /*!
-       * Constructs a text item with \a key and \a value.
+       * Constructs an item with \a key and \a value.
        */
       // BIC: Remove this, StringList has a constructor from a single string
       Item(const String &key, const String &value);
 
       /*!
-       * Constructs a text item with \a key and \a values.
+       * Constructs an item with \a key and \a values.
        */
       Item(const String &key, const StringList &values);
 
-      /*!
-       * Constructs an item with \a key and \a value.
-       * If \a binary is true a Binary item will be created, otherwise \a value will be interpreted as text
-       */
-      Item(const String &key, const ByteVector &value, bool binary);
-
       /*!
        * Construct an item as a copy of \a item.
        */
@@ -97,20 +91,12 @@ namespace TagLib {
 
       /*!
        * Returns the binary value.
-       * If the item type is not \a Binary, the returned contents are undefined
+       *
+       * \deprecated This will be removed in the next binary incompatible version
+       * as it is not kept in sync with the things that are set using setValue()
+       * and friends.
        */
-      ByteVector binaryData() const;
-
-     /*!
-      * Set the binary value to \a value
-      * The item's type will also be set to \a Binary
-      */
-      void setBinaryData(const ByteVector &value);
-
-#ifndef DO_NOT_DOCUMENT
-      /* Remove in next binary incompatible release */
       ByteVector value() const;
-#endif
 
       /*!
        * Sets the key for the item to \a key.
@@ -118,14 +104,14 @@ namespace TagLib {
       void setKey(const String &key);
 
       /*!
-       * Sets the text value of the item to \a value and clears any previous contents.
+       * Sets the value of the item to \a value and clears any previous contents.
        *
        * \see toString()
        */
       void setValue(const String &value);
 
       /*!
-       * Sets the text value of the item to the list of values in \a value and clears
+       * Sets the value of the item to the list of values in \a value and clears
        * any previous contents.
        *
        * \see toStringList()
@@ -133,14 +119,14 @@ namespace TagLib {
       void setValues(const StringList &values);
 
       /*!
-       * Appends \a value to create (or extend) the current list of text values.
+       * Appends \a value to create (or extend) the current list of values.
        *
        * \see toString()
        */
       void appendValue(const String &value);
 
       /*!
-       * Appends \a values to extend the current list of text values.
+       * Appends \a values to extend the current list of values.
        *
        * \see toStringList()
        */
@@ -157,13 +143,14 @@ namespace TagLib {
        */
       String toString() const;
 
-#ifndef DO_NOT_DOCUMENT
-      /* Remove in next binary incompatible release */
+      /*!
+       * \deprecated
+       * \see values
+       */
       StringList toStringList() const;
-#endif
 
       /*!
-       * Returns the list of text values.
+       * Returns the list of values.
        */
       StringList values() const;
 

taglib/ape/apeproperties.cpp

@@ -46,7 +46,6 @@ public:
     channels(0),
     version(0),
     bitsPerSample(0),
-    sampleFrames(0),
     file(file),
     streamLength(streamLength) {}
 
@@ -56,7 +55,6 @@ public:
   int channels;
   int version;
   int bitsPerSample;
-  uint sampleFrames;
   File *file;
   long streamLength;
 };
@@ -106,11 +104,6 @@ int APE::Properties::bitsPerSample() const
   return d->bitsPerSample;
 }
 
-TagLib::uint APE::Properties::sampleFrames() const
-{
-  return d->sampleFrames;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
@@ -199,8 +192,8 @@ void APE::Properties::analyzeCurrent()
   uint totalFrames = header.mid(12, 4).toUInt(false);
   uint blocksPerFrame = header.mid(4, 4).toUInt(false);
   uint finalFrameBlocks = header.mid(8, 4).toUInt(false);
-  d->sampleFrames = totalFrames > 0 ? (totalFrames -  1) * blocksPerFrame + finalFrameBlocks : 0;
-  d->length = d->sampleRate > 0 ? d->sampleFrames / d->sampleRate : 0;
+  uint totalBlocks = totalFrames > 0 ? (totalFrames -  1) * blocksPerFrame + finalFrameBlocks : 0;
+  d->length = d->sampleRate > 0 ? totalBlocks / d->sampleRate : 0;
   d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
 }
 

taglib/ape/apeproperties.h

@@ -71,7 +71,6 @@ namespace TagLib {
        * Returns number of bits per sample.
        */
       int bitsPerSample() const;
-      uint sampleFrames() const;
 
       /*!
        * Returns APE version.

taglib/ape/apetag.cpp

@@ -34,7 +34,6 @@
 #include <tfile.h>
 #include <tstring.h>
 #include <tmap.h>
-#include <tpropertymap.h>
 
 #include "apetag.h"
 #include "apefooter.h"
@@ -48,7 +47,7 @@ class APE::Tag::TagPrivate
 public:
   TagPrivate() : file(0), footerLocation(-1), tagLength(0) {}
 
-  TagLib::File *file;
+  File *file;
   long footerLocation;
   long tagLength;
 
@@ -66,7 +65,7 @@ APE::Tag::Tag() : TagLib::Tag()
   d = new TagPrivate;
 }
 
-APE::Tag::Tag(TagLib::File *file, long footerLocation) : TagLib::Tag()
+APE::Tag::Tag(File *file, long footerLocation) : TagLib::Tag()
 {
   d = new TagPrivate;
   d->file = file;
@@ -175,86 +174,6 @@ void APE::Tag::setTrack(uint i)
     addValue("TRACK", String::number(i), true);
 }
 
-// conversions of tag keys between what we use in PropertyMap and what's usual
-// for APE tags
-static const TagLib::uint keyConversionsSize = 5; //usual,         APE
-static const char *keyConversions[][2] =  {{"TRACKNUMBER", "TRACK"       },
-                                           {"DATE",        "YEAR"        },
-                                           {"ALBUMARTIST", "ALBUM ARTIST"},
-                                           {"DISCNUMBER",  "DISC"        },
-                                           {"REMIXER",     "MIXARTIST"   }};
-
-PropertyMap APE::Tag::properties() const
-{
-  PropertyMap properties;
-  ItemListMap::ConstIterator it = itemListMap().begin();
-  for(; it != itemListMap().end(); ++it) {
-    String tagName = PropertyMap::prepareKey(it->first);
-    // if the item is Binary or Locator, or if the key is an invalid string,
-    // add to unsupportedData
-    if(it->second.type() != Item::Text || tagName.isNull())
-      properties.unsupportedData().append(it->first);
-    else {
-      // Some tags need to be handled specially
-      for(uint i = 0; i < keyConversionsSize; ++i)
-        if(tagName == keyConversions[i][1])
-          tagName = keyConversions[i][0];
-        properties[tagName].append(it->second.toStringList());
-    }
-  }
-  return properties;
-}
-
-void APE::Tag::removeUnsupportedProperties(const StringList &properties)
-{
-  StringList::ConstIterator it = properties.begin();
-  for(; it != properties.end(); ++it)
-    removeItem(*it);
-}
-
-PropertyMap APE::Tag::setProperties(const PropertyMap &origProps)
-{
-  PropertyMap properties(origProps); // make a local copy that can be modified
-
-  // see comment in properties()
-  for(uint i = 0; i < keyConversionsSize; ++i)
-    if(properties.contains(keyConversions[i][0])) {
-      properties.insert(keyConversions[i][1], properties[keyConversions[i][0]]);
-      properties.erase(keyConversions[i][0]);
-    }
-
-  // first check if tags need to be removed completely
-  StringList toRemove;
-  ItemListMap::ConstIterator remIt = itemListMap().begin();
-  for(; remIt != itemListMap().end(); ++remIt) {
-    String key = PropertyMap::prepareKey(remIt->first);
-    // only remove if a) key is valid, b) type is text, c) key not contained in new properties
-    if(!key.isNull() && remIt->second.type() == APE::Item::Text && !properties.contains(key))
-      toRemove.append(remIt->first);
-  }
-
-  for (StringList::Iterator removeIt = toRemove.begin(); removeIt != toRemove.end(); removeIt++)
-    removeItem(*removeIt);
-
-  // now sync in the "forward direction"
-  PropertyMap::ConstIterator it = properties.begin();
-  for(; it != properties.end(); ++it) {
-    const String &tagName = it->first;
-    if(!(itemListMap().contains(tagName)) || !(itemListMap()[tagName].values() == it->second)) {
-      if(it->second.size() == 0)
-        removeItem(tagName);
-      else {
-        StringList::ConstIterator valueIt = it->second.begin();
-        addValue(tagName, *valueIt, true);
-        ++valueIt;
-        for(; valueIt != it->second.end(); ++valueIt)
-          addValue(tagName, *valueIt, false);
-      }
-    }
-  }
-  return PropertyMap();
-}
-
 APE::Footer *APE::Tag::footer() const
 {
   return &d->footer;
@@ -276,31 +195,17 @@ void APE::Tag::addValue(const String &key, const String &value, bool replace)
 {
   if(replace)
     removeItem(key);
-  if(!key.isEmpty() && !value.isEmpty()) {
-    if(!replace && d->itemListMap.contains(key)) {
-      // Text items may contain more than one value
-      if(APE::Item::Text == d->itemListMap.begin()->second.type())
-        d->itemListMap[key.upper()].appendValue(value);
-      // Binary or locator items may have only one value
-      else
-        setItem(key, Item(key, value));
-    }
+  if(!value.isEmpty()) {
+    if(d->itemListMap.contains(key) || !replace)
+      d->itemListMap[key.upper()].appendValue(value);
     else
       setItem(key, Item(key, value));
   }
 }
 
-void APE::Tag::setData(const String &key, const ByteVector &value)
-{
-  removeItem(key);
-  if(!key.isEmpty() && !value.isEmpty())
-    setItem(key, Item(key, value, true));
-}
-
 void APE::Tag::setItem(const String &key, const Item &item)
 {
-  if(!key.isEmpty())
-    d->itemListMap.insert(key.upper(), item);
+  d->itemListMap.insert(key.upper(), item);
 }
 
 bool APE::Tag::isEmpty() const

taglib/ape/apetag.h

@@ -103,30 +103,6 @@ namespace TagLib {
       virtual void setYear(uint i);
       virtual void setTrack(uint i);
 
-      /*!
-       * Implements the unified tag dictionary interface -- export function.
-       * APE tags are perfectly compatible with the dictionary interface because they
-       * support both arbitrary tag names and multiple values. Currently only
-       * APE items of type *Text* are handled by the dictionary interface; all *Binary*
-       * and *Locator* items will be put into the unsupportedData list and can be
-       * deleted on request using removeUnsupportedProperties(). The same happens
-       * to Text items if their key is invalid for PropertyMap (which should actually
-       * never happen).
-       *
-       * The only conversion done by this export function is to rename the APE tags
-       * TRACK to TRACKNUMBER, YEAR to DATE, and ALBUM ARTIST to ALBUMARTIST, respectively,
-       * in order to be compliant with the names used in other formats.
-       */
-      PropertyMap properties() const;
-
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified tag dictionary interface -- import function. The same
-       * comments as for the export function apply.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns a pointer to the tag's footer.
        */
@@ -152,19 +128,12 @@ namespace TagLib {
       void removeItem(const String &key);
 
       /*!
-       * Adds to the text item specified by \a key the data \a value.  If \a replace
+       * Adds to the item specified by \a key the data \a value.  If \a replace
        * is true, then all of the other values on the same key will be removed
-       * first.  If a binary item exists for \a key it will be removed first.
+       * first.
        */
       void addValue(const String &key, const String &value, bool replace = true);
 
-     /*!
-      * Set the binary data for the key specified by \a item to \a value
-      * This will convert the item to type \a Binary if it isn't already and
-      * all of the other values on the same key will be removed.
-      */
-      void setData(const String &key, const ByteVector &value);
-
       /*!
        * Sets the \a key item to the value of \a item. If an item with the \a key is already
        * present, it will be replaced.

taglib/asf/CMakeLists.txt

@@ -0,0 +1 @@
+INSTALL( FILES  asffile.h asfproperties.h asftag.h asfattribute.h asfpicture.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)