Add unit tests

http://bugs.kde.org/show_bug.cgi?id=254223

.astylerc

@@ -1,18 +0,0 @@
---suffix=none
---style=kr
---indent=spaces=2
---indent-col1-comments
---min-conditional-indent=0
---attach-extern-c
---attach-namespaces
---indent-namespaces
---pad-oper
---unpad-paren
---align-pointer=name
---align-reference=name
---max-instatement-indent=40
---break-closing-brackets
---remove-brackets
---convert-tabs
---max-code-length=100
---break-after-logical

.editorconfig

@@ -1,21 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Non-specified newlines with a newline ending every file
-[*]
-insert_final_newline = true
-
-# 2 space indentation
-[*.{h,cpp,tcc,cmake,yml}]
-indent_style = space
-indent_size = 2
-
-# Trim traling whitespaces
-[*.{h,cpp,tcc,cmake,yml}]
-trim_trailing_whitespace = true
-
-# UTF-8 without BOM
-[*]
-charset = utf-8

.gitignore

@@ -1,7 +1,5 @@
 cmake_install.cmake
-cmake_uninstall.cmake
 Makefile
-CTestTestfile.cmake
 CMakeFiles/
 *.so
 *.so.*
@@ -18,7 +16,6 @@ CMakeFiles/
 /config.h
 /taglib.pc
 /tests/test_runner
-/tests/Testing
 /taglib_config.h
 /taglib-config
 /bindings/c/taglib_c.pc
@@ -42,5 +39,3 @@ CMakeFiles/
 /taglib/tag.dir/Release
 /ALL_BUILD.dir
 /ZERO_CHECK.dir
-taglib.xcodeproj
-CMakeScripts

.travis.yml

@@ -1,28 +0,0 @@
-language: cpp
-
-sudo: false
-
-os:
-  - linux
-  - osx
-
-compiler:
-  - gcc
-  - clang
-
-addons:
-  apt:
-    packages:
-      - libcppunit-dev
-      - zlib1g-dev
-
-matrix:
-  exclude:
-    - os: osx
-      compiler: gcc
-
-install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cppunit; fi
-
-script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BINDINGS=ON . && make && make check
-

AUTHORS

@@ -10,8 +10,6 @@ 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
-Tsuda Kageyu <tsuda.kageyu@gmail.com>
- A lot of fixes and improvements, i.e. memory copy reduction etc.
 
 Please send all patches and questions to taglib-devel@kde.org rather than to
 individual developers!

CMakeLists.txt

@@ -1,55 +1,33 @@
 project(taglib)
 
-cmake_minimum_required(VERSION 2.8.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 
-if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.12)
-  cmake_policy(SET CMP0022 OLD)
-endif()
-
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
-
-if(DEFINED ENABLE_STATIC)
-  message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
-endif()
-
-if(NOT BUILD_SHARED_LIBS)
+option(ENABLE_STATIC "Make static version of libtag"  OFF)
+if(ENABLE_STATIC)
   add_definitions(-DTAGLIB_STATIC)
-endif()
-option(ENABLE_STATIC_RUNTIME "Visual Studio, link with runtime statically" OFF)
-
-option(ENABLE_CCACHE "Use ccache when building libtag" OFF)
-if(ENABLE_CCACHE)
-  find_program(CCACHE_FOUND ccache)
-  if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-  endif()
+  set(BUILD_SHARED_LIBS OFF)
+else()
+  set(BUILD_SHARED_LIBS ON)
 endif()
 
-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(BUILD_BINDINGS "Build the bindings" ON)
-
-option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs" OFF)
+option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
 
 add_definitions(-DHAVE_CONFIG_H)
 set(TESTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/")
 
 ## 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")
-set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)")
-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})")
-set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix")
+set(EXEC_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" CACHE PATH "Base directory for executables and libraries" FORCE)
+set(BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/bin" CACHE PATH "The subdirectory to the binaries prefix (default prefix/bin)" FORCE)
+set(LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
+set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The subdirectory to the header prefix" FORCE)
 
 if(APPLE)
-  option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
-  set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to.")
+	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_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
@@ -57,41 +35,19 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   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 "0")
 
-# Read version information from file taglib/toolkit/taglib.h into variables
-# TAGLIB_LIB_MAJOR_VERSION, TAGLIB_LIB_MINOR_VERSION, TAGLIB_LIB_PATCH_VERSION.
-foreach(version_part MAJOR MINOR PATCH)
-  set(version_var_name "TAGLIB_${version_part}_VERSION")
-  file(STRINGS taglib/toolkit/taglib.h version_line
-       REGEX "^#define +${version_var_name}")
-  if(NOT version_line)
-    message(FATAL_ERROR "${version_var_name} not found in taglib.h")
-  endif()
-  string(REGEX MATCH "${version_var_name} +([^ ]+)" result ${version_line})
-  set(TAGLIB_LIB_${version_part}_VERSION ${CMAKE_MATCH_1})
-endforeach(version_part)
-
-# Only used to force cmake rerun when taglib.h changes.
-configure_file(taglib/toolkit/taglib.h ${CMAKE_CURRENT_BINARY_DIR}/taglib.h.stamp)
-
-if("${TAGLIB_LIB_PATCH_VERSION}" EQUAL "0")
-  set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}")
-else()
-  set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
-endif()
+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  17)
+# 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      16)
+set(TAGLIB_SOVERSION_AGE      10)
 
 math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
 math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
@@ -99,65 +55,40 @@ math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")
 
 include(ConfigureChecks.cmake)
 
-if(NOT WIN32)
-  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}")
-endif()
+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(WIN32)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmd.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd")
-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${BIN_INSTALL_DIR}")
-endif()
-
-if(NOT BUILD_FRAMEWORK)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-endif()
-
-if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
-  set(HAVE_ZLIB 1)
-  set(HAVE_ZLIB_SOURCE 1)
+if(NOT WIN32 AND NOT BUILD_FRAMEWORK)
+  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()
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-configure_file(config.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)
+    set(TAGLIB_WITH_ASF TRUE)
 endif()
 if(WITH_MP4)
-  set(TAGLIB_WITH_MP4 TRUE)
+    set(TAGLIB_WITH_MP4 TRUE)
 endif()
 
-option(TRACE_IN_RELEASE "Output debug messages even in release mode" OFF)
-if(TRACE_IN_RELEASE)
-  set(TRACE_IN_RELEASE TRUE)
-endif()
+configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)
 
-configure_file(taglib/taglib_config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h")
+add_subdirectory(taglib) 
+add_subdirectory(bindings)
+add_subdirectory(tests)
+add_subdirectory(examples)
 
-add_subdirectory(taglib)
-
-if(BUILD_BINDINGS)
-  add_subdirectory(bindings)
-endif()
-
-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
-
-if(BUILD_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 file(COPY doc/taglib.png DESTINATION doc)
 add_custom_target(docs doxygen)
 
 # uninstall target
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY)
+configure_file(
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
 
-if(NOT TARGET uninstall)
-  add_custom_target(uninstall COMMAND "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-endif()
+add_custom_target(uninstall
+  COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

ConfigureChecks.cmake

@@ -1,248 +1,23 @@
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckSymbolExists)
+include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckTypeSize)
 include(CheckCXXSourceCompiles)
 
-# Check if the size of numeric types are suitable.
-
-check_type_size("short" SIZEOF_SHORT)
-if(NOT ${SIZEOF_SHORT} EQUAL 2)
-  message(FATAL_ERROR "TagLib requires that short is 16-bit wide.")
+# 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_type_size("int" SIZEOF_INT)
-if(NOT ${SIZEOF_INT} EQUAL 4)
-  message(FATAL_ERROR "TagLib requires that int is 32-bit wide.")
-endif()
-
-check_type_size("long long" SIZEOF_LONGLONG)
-if(NOT ${SIZEOF_LONGLONG} EQUAL 8)
-  message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.")
-endif()
-
-check_type_size("wchar_t" SIZEOF_WCHAR_T)
-if(${SIZEOF_WCHAR_T} LESS 2)
-  message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.")
-endif()
-
-check_type_size("float" SIZEOF_FLOAT)
-if(NOT ${SIZEOF_FLOAT} EQUAL 4)
-  message(FATAL_ERROR "TagLib requires that float is 32-bit wide.")
-endif()
-
-check_type_size("double" SIZEOF_DOUBLE)
-if(NOT ${SIZEOF_DOUBLE} EQUAL 8)
-  message(FATAL_ERROR "TagLib requires that double is 64-bit wide.")
-endif()
-
-# Enable check_cxx_source_compiles() to work with Boost "header-only" libraries.
-
-find_package(Boost)
-if(Boost_FOUND)
-  set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${Boost_INCLUDE_DIRS}")
-endif()
-
-# Determine which kind of atomic operations your compiler supports.
-
-check_cxx_source_compiles("
-  #include <atomic>
-  int main() {
-    std::atomic<unsigned int> x;
-    x.fetch_add(1);
-    x.fetch_sub(1);
-    return 0;
-  }
-" HAVE_STD_ATOMIC)
-
-if(NOT HAVE_STD_ATOMIC)
-  find_package(Boost COMPONENTS atomic)
-  if(Boost_ATOMIC_FOUND)
-    set(HAVE_BOOST_ATOMIC 1)
-  else()
-    set(HAVE_BOOST_ATOMIC 0)
-  endif()
-
-  if(NOT HAVE_BOOST_ATOMIC)
-    check_cxx_source_compiles("
-      int main() {
-        volatile int x;
-        __sync_add_and_fetch(&x, 1);
-        int y = __sync_sub_and_fetch(&x, 1);
-        return 0;
-      }
-    " HAVE_GCC_ATOMIC)
-
-    if(NOT HAVE_GCC_ATOMIC)
-      check_cxx_source_compiles("
-        #include <libkern/OSAtomic.h>
-        int main() {
-          volatile int32_t x;
-          OSAtomicIncrement32Barrier(&x);
-          int32_t y = OSAtomicDecrement32Barrier(&x);
-          return 0;
-        }
-      " HAVE_MAC_ATOMIC)
-
-      if(NOT HAVE_MAC_ATOMIC)
-        check_cxx_source_compiles("
-          #include <windows.h>
-          int main() {
-            volatile LONG x;
-            InterlockedIncrement(&x);
-            LONG y = InterlockedDecrement(&x);
-            return 0;
-          }
-        " HAVE_WIN_ATOMIC)
-
-        if(NOT HAVE_WIN_ATOMIC)
-          check_cxx_source_compiles("
-            #include <ia64intrin.h>
-            int main() {
-              volatile int x;
-              __sync_add_and_fetch(&x, 1);
-              int y = __sync_sub_and_fetch(&x, 1);
-              return 0;
-            }
-          " HAVE_IA64_ATOMIC)
-        endif()
-      endif()
-    endif()
-  endif()
-endif()
-
-# Determine which kind of byte swap functions your compiler supports.
-
-check_cxx_source_compiles("
-  #include <boost/endian/conversion.hpp>
-  int main() {
-    boost::endian::endian_reverse(static_cast<uint16_t>(1));
-    boost::endian::endian_reverse(static_cast<uint32_t>(1));
-    boost::endian::endian_reverse(static_cast<uint64_t>(1));
-    return 0;
-  }
-" HAVE_BOOST_BYTESWAP)
-
-if(NOT HAVE_BOOST_BYTESWAP)
-  check_cxx_source_compiles("
-    int main() {
-      __builtin_bswap16(0);
-      __builtin_bswap32(0);
-      __builtin_bswap64(0);
-      return 0;
-    }
-  " HAVE_GCC_BYTESWAP)
-
-  if(NOT HAVE_GCC_BYTESWAP)
-    check_cxx_source_compiles("
-      #include <byteswap.h>
-      int main() {
-        __bswap_16(0);
-        __bswap_32(0);
-        __bswap_64(0);
-        return 0;
-      }
-    " HAVE_GLIBC_BYTESWAP)
-
-    if(NOT HAVE_GLIBC_BYTESWAP)
-      check_cxx_source_compiles("
-        #include <stdlib.h>
-        int main() {
-          _byteswap_ushort(0);
-          _byteswap_ulong(0);
-          _byteswap_uint64(0);
-          return 0;
-        }
-      " HAVE_MSC_BYTESWAP)
-
-      if(NOT HAVE_MSC_BYTESWAP)
-        check_cxx_source_compiles("
-          #include <libkern/OSByteOrder.h>
-          int main() {
-            OSSwapInt16(0);
-            OSSwapInt32(0);
-            OSSwapInt64(0);
-            return 0;
-          }
-        " HAVE_MAC_BYTESWAP)
-
-        if(NOT HAVE_MAC_BYTESWAP)
-          check_cxx_source_compiles("
-            #include <sys/endian.h>
-            int main() {
-              swap16(0);
-              swap32(0);
-              swap64(0);
-              return 0;
-            }
-          " HAVE_OPENBSD_BYTESWAP)
-        endif()
-      endif()
-    endif()
-  endif()
-endif()
-
-# Determine whether your compiler supports some safer version of vsprintf.
-
-check_cxx_source_compiles("
-  #include <cstdio>
-  #include <cstdarg>
-  int main() {
-    char buf[20];
-    va_list args;
-    vsnprintf(buf, 20, \"%d\", args);
-    return 0;
-  }
-" HAVE_VSNPRINTF)
-
-if(NOT HAVE_VSNPRINTF)
-  check_cxx_source_compiles("
-    #include <cstdio>
-    #include <cstdarg>
-    int main() {
-      char buf[20];
-      va_list args;
-      vsprintf_s(buf, \"%d\", args);
-      return 0;
-    }
-  " HAVE_VSPRINTF_S)
-endif()
-
-# Determine whether your compiler supports ISO _strdup.
-
-check_cxx_source_compiles("
-  #include <cstring>
-  int main() {
-    _strdup(0);
-    return 0;
-  }
-" HAVE_ISO_STRDUP)
-
-# Determine whether zlib is installed.
-
-if(NOT ZLIB_SOURCE)
-  find_package(ZLIB)
-  if(ZLIB_FOUND)
-    set(HAVE_ZLIB 1)
-  else()
-    set(HAVE_ZLIB 0)
-  endif()
-
-  if(NOT HAVE_ZLIB)
-    find_package(Boost COMPONENTS iostreams zlib)
-    if(Boost_IOSTREAMS_FOUND AND Boost_ZLIB_FOUND)
-      set(HAVE_BOOST_ZLIB 1)
-    else()
-      set(HAVE_BOOST_ZLIB 0)
-    endif()
-  endif()
-endif()
-
-# Determine whether CppUnit is installed.
-
-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-  find_package(CppUnit)
-  if(NOT CppUnit_FOUND)
-    message(STATUS "CppUnit not found, disabling tests.")
-    set(BUILD_TESTS OFF)
-  endif()
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+find_package(CppUnit)
+if(NOT CppUnit_FOUND AND BUILD_TESTS)
+	message(STATUS "CppUnit not found, disabling tests.")
+	set(BUILD_TESTS OFF)
 endif()
 

INSTALL

@@ -5,7 +5,7 @@ TagLib uses the CMake build system. As a user, you will most likely want to
 build TagLib in release mode and install it into a system-wide location.
 This can be done using the following commands:
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release .
+  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_RELEASE_TYPE=Release .
   make
   sudo make install
 
@@ -16,8 +16,8 @@ In order to build the included examples, use the BUILD_EXAMPLES option:
 See http://www.cmake.org/cmake/help/runningcmake.html for generic help on
 running CMake.
 
-Mac OS X
---------
+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
@@ -30,130 +30,14 @@ an Universal Binary framework with Mac OS X 10.4 as the deployment target:
     -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" \
-    -DBUILD_SHARED_LIBS=OFF \
-    -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
--------
-
-It's Windows ... Systems vary!
-This means you need to adjust things to suit your system, especially paths.
-
-Tested with:
-  Microsoft Visual Studio 2010
-  Gcc by mingw-w64.sf.net v4.6.3 (Strawberry Perl 32b)
-  MinGW32-4.8.0
-
-Requirements:
-  1. Tool chain, Build Environment, Whatever ya want to call it ...
-     Installed and working.
-  2. CMake program. (Available at: www.cmake.org)
-     Installed and working.
-
-Optional:
-  1. Zlib library.
-     Available in some Tool Chains, Not all.
-     Search the web, Take your choice.
-
-Useful configuration options used with CMake (GUI and/or Command line):
-  Any of the ZLIB_ variables may be used at the command line, ZLIB_ROOT is only
-  available on the Command line.
-  ZLIB_ROOT=            Where to find ZLib's root directory.
-                        Assumes parent of: \include and \lib.
-  ZLIB_INCLUDE_DIR=     Where to find ZLib's Include directory.
-  ZLIB_LIBRARY=         Where to find ZLib's Library.
-  ZLIB_SOURCE=          Where to find ZLib's Source Code.
-                        Alternative to ZLIB_INCLUDE_DIR and ZLIB_LIBRARY.
-  CMAKE_INSTALL_PREFIX= Where to install Taglib.
-  CMAKE_BUILD_TYPE=     Release, Debug, etc ... (Not available in MSVC)
-
-The easiest way is at the Command Prompt.
-  MSVS Command Prompt for MSVS Users.
-  (Batch file and/or Shortcuts are your friends)
-
-  1. Build the Makefiles:
-       Replace "GENERATOR" with your needs.
-       For MSVS : "Visual Studio X" where X is the single or two digit version.
-       For MinGW: "MinGW Makefiles"
-
-       C:\GitRoot\taglib> cmake -G "GENERATOR" -DCMAKE_INSTALL_PREFIX=C:\Libraries\taglib
-
-     Or use the CMake GUI:
-       1. Open CMake GUI.
-       2. Set Paths.
-          "Where is the source code" and "Where to build the binaries"
-          Example, Both would be: C:\GitRoot\taglib
-       3. Tick: Advanced
-       4. Select: Configure
-       5. Select: Generator
-       6. Tick: Use default native compilers
-       7. Select: Finish
-       Wait until done.
-       5. If using ZLib, Scroll down.
-          (to the bottom of the list of options ... should go over them all)
-          1. Edit: ZLIB_INCLUDE_DIR
-          2. Edit: ZLIB_LIBRARY
-       6. Select: Generate
-
-  2. Build the project:
-       MSVS:
-         C:\GitRoot\taglib> msbuild all_build.vcxproj /p:Configuration=Release
-           OR (Depending on MSVS version or personal choice)
-         C:\GitRoot\taglib> devenv all_build.vcxproj /build Release
-       MinGW:
-         C:\GitRoot\taglib> gmake
-           OR (Depending on MinGW install)
-         C:\GitRoot\taglib> mingw32-make
-
-     Or in the MSVS GUI:
-       1. Open MSVS.
-       2. Open taglib solution.
-       3. Set build type to: Release (look in the tool bars)
-       2. Hit F7 to build the solution. (project)
-
-  3. Install the project:
-       (Change 'install' to 'uninstall' to uninstall the project)
-       MSVS:
-         C:\GitRoot\taglib> msbuild install.vcxproj
-           OR (Depending on MSVC version or personal choice)
-         C:\GitRoot\taglib> devenv install.vcxproj
-       MinGW:
-         C:\GitRoot\taglib> gmake install
-           OR (Depending on MinGW install)
-         C:\GitRoot\taglib> mingw32-make install
-
-     Or in the MSVS GUI:
-       1. Open project.
-       2. Open Solution Explorer.
-       3. Right Click: INSTALL
-       4. Select: Project Only
-       5. Select: Build Only INSTALL
-
-To build a static library, set the following two options with CMake.
-  -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON
-
-Including ENABLE_STATIC_RUNTIME=ON indicates you want TagLib built using the
-static runtime library, rather than the DLL form of the runtime.
+    -DCMAKE_OSX_ARCHITECTURES="ppc;i368;x86_64"
 
 Unit Tests
 ----------
 
 If you want to run the test suite to make sure TagLib works properly on your
-system, you need to have cppunit installed. 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:
+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
 

NEWS

@@ -1,181 +1,10 @@
-TagLib 1.11 (Mar 4, 2016)
-=========================
+TagLib 1.8 (In Development)
+===========================
 
-1.11 BETA 2:
-
- * Better handling of PCM WAV files with a 'fact' chunk.
- * Better handling of corrupted APE tags.
- * Efficient decoding of unsynchronized ID3v2 frames.
- * Fixed text encoding when saving certain frames in ID3v2.3 tags.
- * Fixed updating the size of RIFF files when removing chunks.
- * Several smaller bug fixes and performance improvements.
-
-1.11 BETA:
-
- * New API for creating FileRef from IOStream.
- * Added support for ID3v2 PCST and WFED frames.
- * Added support for pictures in XiphComment.
- * Added String::clear().
- * Added FLAC::File::strip() for removing non-standard tags.
- * Added alternative functions to XiphComment::removeField().
- * Added BUILD_BINDINGS build option.
- * Added ENABLE_CCACHE build option.
- * Replaced ENABLE_STATIC build option with BUILD_SHARED_LIBS.
- * Better handling of duplicate ID3v2 tags in all kinds of files.
- * Better handling of duplicate tag chunks in WAV files.
- * Better handling of duplicate tag chunks in AIFF files.
- * Better handling of duplicate Vorbis comment blocks in FLAC files.
- * Better handling of broken MPEG audio frames.
- * Fixed crash when calling File::properties() after strip().
- * Fixed crash when parsing certain MPEG files.
- * Fixed crash when saving Ogg files.
- * Fixed possible file corruptions when saving ASF files.
- * Fixed possible file corruptions when saving FLAC files.
- * Fixed possible file corruptions when saving MP4 files.
- * Fixed possible file corruptions when saving MPEG files.
- * Fixed possible file corruptions when saving APE files.
- * Fixed possible file corruptions when saving Musepack files.
- * Fixed possible file corruptions when saving WavPack files.
- * Fixed updating the comment field of Vorbis comments.
- * Fixed reading date and time in ID3v2.3 tags.
- * Marked ByteVector::null and ByteVector::isNull() deprecated.
- * Marked String::null and String::isNull() deprecated.
- * Marked XiphComment::removeField() deprecated.
- * Marked Ogg::Page::getCopyWithNewPageSequenceNumber() deprecated. It returns null.
- * Marked custom integer types deprecated.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.10 (Nov 11, 2015)
-==========================
-
-1.10:
-
- * Added new options to the tagwriter example.
- * Fixed self-assignment operator in some types.
- * Fixed extraction of MP4 tag keys with an empty list.
-
-1.10 BETA:
-
- * New API for the audio length in milliseconds.
- * Added support for ID3v2 ETCO and SYLT frames.
- * Added support for album artist in PropertyMap API of MP4 files.
- * Added support for embedded frames in ID3v2 CHAP and CTOC frames.
- * Added support for AIFF-C files.
- * Better handling of duplicate ID3v2 tags in MPEG files.
- * Allowed generating taglib.pc on Windows.
- * Added ZLIB_SOURCE build option.
- * Fixed backwards-incompatible change in TagLib::String when constructing UTF16 strings.
- * Fixed crash when parsing certain FLAC files.
- * Fixed crash when encoding empty strings.
- * Fixed saving of certain XM files on OS X.
- * Changed Xiph and APE generic getters to return space-concatenated values.
- * Fixed possible file corruptions when removing tags from WAV files.
- * Added support for MP4 files with 64-bit atoms in certain 64-bit environments.
- * Prevented ID3v2 padding from being too large.
- * Fixed crash when parsing corrupted APE files.
- * Fixed crash when parsing corrupted WAV files.
- * Fixed crash when parsing corrupted Ogg FLAC files.
- * Fixed crash when parsing corrupted MPEG files.
- * Fixed saving empty tags in WAV files.
- * Fixed crash when parsing corrupted Musepack files.
- * Fixed possible memory leaks when parsing AIFF and WAV files.
- * Fixed crash when parsing corrupted MP4 files.
- * Stopped writing empty ID3v2 frames.
- * Fixed possible file corruptions when saving WMA files.
- * Added TagLib::MP4::Tag::isEmpty().
- * Added accessors to manipulate MP4 tags.
- * Fixed crash when parsing corrupted WavPack files.
- * Fixed seeking MPEG frames.
- * Fixed reading FLAC files with zero-sized padding blocks.
- * Added support for reading the encoder information of WMA files.
- * Added support for reading the codec of WAV files.
- * Added support for multi channel WavPack files.
- * Added support for reading the nominal bitrate of Ogg Speex files.
- * Added support for VBR headers in MPEG files.
- * Marked FLAC::File::streamInfoData() deprecated. It returns an empty ByteVector.
- * Marked FLAC::File::streamLength() deprecated. It returns zero.
- * Fixed possible file corruptions when adding an ID3v1 tag to FLAC files.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.9.1 (Oct 8, 2013)
-==========================
-
- * Fixed binary incompatible change in TagLib::Map and TagLib::List.
- * Fixed constructing String from ByteVector.
- * Fixed compilation on MSVC with the /Zc:wchar_t- option.
- * Fixed detecting of RIFF files with invalid chunk sizes.
- * Added TagLib::MP4::Properties::codec().
-
-TagLib 1.9 (Oct 6, 2013)
-========================
-
- * Added support for the Ogg Opus file format.
- * Added support for INFO tags in WAV files.
- * Changed FileStream to use Windows file API.
- * Included taglib-config.cmd script for Windows.
- * New ID3v1::Tag methods for working directly with genre numbers.
- * New MPEG::File methods for checking which tags are saved in the file.
- * Added support for the PropertyMap API to ASF and MP4 files.
- * Added MusicBrainz identifiers to the PropertyMap API.
- * Allowed reading of MP4 cover art without an explicitly specified format.
- * Better parsing of corrupted FLAC files.
- * Fixed saving of PropertyMap comments without description into ID3v2 tags.
- * Fixed crash when parsing certain XM files.
- * Fixed compilation of unit test with clang.
- * Better handling of files that can't be open or have read-only permissions.
- * Improved atomic reference counting.
- * New hookable API for debug messages.
- * More complete Windows install instructions.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.8 (Sep 6, 2012)
-========================
-
-1.8:
-
- * Added support for OWNE ID3 frames.
- * Changed key validation in the new PropertyMap API.
- * ID3v1::Tag::setStringHandler will no londer delete the previous handler,
-   the caller is responsible for this.
- * File objects will also no longer delete the passed IOStream objects. It
-   should be done in the caller code after the File object is no longer
-   used.
- * Added ID3v2::Tag::setLatin1StringHandler for custom handling of
-   latin1-encoded text in ID3v2 frames.
- * Fixed validation of ID3v2 frame IDs (IDs with '0' were ignored).
-
-1.8 BETA:
-
- * 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.
-
-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.
+ * Started using atomic int operations for reference counting.
+ * Find APE tags even if there's a Lyrics3v2 tag present (BUG:254223).
 
 TagLib 1.7 (Mar 11, 2011)
 =========================

bindings/c/CMakeLists.txt

@@ -61,7 +61,7 @@ install(TARGETS tag_c
 	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
 )
 
-if(NOT BUILD_FRAMEWORK)
+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()

bindings/c/tag_c.cpp

@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include "config.h"
 #endif
 
 #include <stdlib.h>
@@ -44,46 +44,18 @@
 
 using namespace TagLib;
 
-namespace
-{
-  List<char *> strings;
-  bool unicodeStrings = true;
-  bool stringManagementEnabled = true;
-
-  char *stringToCharArray(const String &s)
-  {
-    const std::string str = s.to8Bit(unicodeStrings);
-
-#ifdef HAVE_ISO_STRDUP
-
-    return ::_strdup(str.c_str());
-
-#else
-
-    return ::strdup(str.c_str());
-
-#endif
-  }
-
-  String charArrayToString(const char *s)
-  {
-    return String(s, unicodeStrings ? String::UTF8 : String::Latin1);
-  }
-}
+static List<char *> strings;
+static bool unicodeStrings = true;
+static bool stringManagementEnabled = true;
 
 void taglib_set_strings_unicode(BOOL unicode)
 {
-  unicodeStrings = (unicode != 0);
+  unicodeStrings = bool(unicode);
 }
 
 void taglib_set_string_management_enabled(BOOL management)
 {
-  stringManagementEnabled = (management != 0);
-}
-
-void taglib_free(void* pointer)
-{
-  free(pointer);
+  stringManagementEnabled = bool(management);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -121,6 +93,8 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
   default:
     return 0;
   }
+
+  return 0;
 }
 
 void taglib_file_free(TagLib_File *file)
@@ -130,7 +104,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)
@@ -157,7 +131,7 @@ BOOL taglib_file_save(TagLib_File *file)
 char *taglib_tag_title(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->title());
+  char *s = ::strdup(t->title().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -166,7 +140,7 @@ char *taglib_tag_title(const TagLib_Tag *tag)
 char *taglib_tag_artist(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->artist());
+  char *s = ::strdup(t->artist().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -175,7 +149,7 @@ char *taglib_tag_artist(const TagLib_Tag *tag)
 char *taglib_tag_album(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->album());
+  char *s = ::strdup(t->album().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -184,7 +158,7 @@ char *taglib_tag_album(const TagLib_Tag *tag)
 char *taglib_tag_comment(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->comment());
+  char *s = ::strdup(t->comment().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -193,7 +167,7 @@ char *taglib_tag_comment(const TagLib_Tag *tag)
 char *taglib_tag_genre(const TagLib_Tag *tag)
 {
   const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->genre());
+  char *s = ::strdup(t->genre().toCString(unicodeStrings));
   if(stringManagementEnabled)
     strings.append(s);
   return s;
@@ -214,31 +188,31 @@ unsigned int taglib_tag_track(const TagLib_Tag *tag)
 void taglib_tag_set_title(TagLib_Tag *tag, const char *title)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setTitle(charArrayToString(title));
+  t->setTitle(String(title, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_artist(TagLib_Tag *tag, const char *artist)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setArtist(charArrayToString(artist));
+  t->setArtist(String(artist, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_album(TagLib_Tag *tag, const char *album)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setAlbum(charArrayToString(album));
+  t->setAlbum(String(album, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_comment(TagLib_Tag *tag, const char *comment)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setComment(charArrayToString(comment));
+  t->setComment(String(comment, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_genre(TagLib_Tag *tag, const char *genre)
 {
   Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setGenre(charArrayToString(genre));
+  t->setGenre(String(genre, unicodeStrings ? String::UTF8 : String::Latin1));
 }
 
 void taglib_tag_set_year(TagLib_Tag *tag, unsigned int year)
@@ -258,7 +232,7 @@ void taglib_tag_free_strings()
   if(!stringManagementEnabled)
     return;
 
-  for(List<char *>::ConstIterator it = strings.begin(); it != strings.end(); ++it)
+  for(List<char *>::Iterator it = strings.begin(); it != strings.end(); ++it)
     free(*it);
   strings.clear();
 }

bindings/c/tag_c.h

@@ -29,9 +29,7 @@
 extern "C" {
 #endif
 
-#if defined(TAGLIB_STATIC)
-#define TAGLIB_C_EXPORT
-#elif defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64)
 #ifdef MAKE_TAGLIB_C_LIB
 #define TAGLIB_C_EXPORT __declspec(dllexport)
 #else
@@ -81,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
  ******************************************************************************/
@@ -106,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.
  */

bindings/c/taglib_c.pc.cmake

@@ -7,6 +7,6 @@ includedir=${INCLUDE_INSTALL_DIR}
 Name: TagLib C Bindings
 Description: Audio meta-data library (C bindings)
 Requires: taglib
-Version: ${TAGLIB_LIB_VERSION_STRING}
+Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
 Libs: -L${LIB_INSTALL_DIR} -ltag_c
 Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 

config-taglib.h.cmake

@@ -0,0 +1,11 @@
+/* config-taglib.h. Generated by cmake from config-taglib.h.cmake */
+
+/* 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@"
+

config.h.cmake

@@ -1,33 +0,0 @@
-/* config.h. Generated by cmake from config.h.cmake */
-
-/* Defined if your compiler supports some byte swap functions */
-#cmakedefine   HAVE_BOOST_BYTESWAP 1
-#cmakedefine   HAVE_GCC_BYTESWAP 1
-#cmakedefine   HAVE_GLIBC_BYTESWAP 1
-#cmakedefine   HAVE_MSC_BYTESWAP 1
-#cmakedefine   HAVE_MAC_BYTESWAP 1
-#cmakedefine   HAVE_OPENBSD_BYTESWAP 1
-
-/* Defined if your compiler supports some atomic operations */
-#cmakedefine   HAVE_STD_ATOMIC 1
-#cmakedefine   HAVE_BOOST_ATOMIC 1
-#cmakedefine   HAVE_GCC_ATOMIC 1
-#cmakedefine   HAVE_MAC_ATOMIC 1
-#cmakedefine   HAVE_WIN_ATOMIC 1
-#cmakedefine   HAVE_IA64_ATOMIC 1
-
-/* Defined if your compiler supports some safer version of vsprintf */
-#cmakedefine   HAVE_VSNPRINTF 1
-#cmakedefine   HAVE_VSPRINTF_S 1
-
-/* Defined if your compiler supports ISO _strdup */
-#cmakedefine   HAVE_ISO_STRDUP 1
-
-/* Defined if zlib is installed */
-#cmakedefine   HAVE_ZLIB 1
-#cmakedefine   HAVE_BOOST_ZLIB 1
-
-/* Indicates whether debug messages are shown even in release mode */
-#cmakedefine   TRACE_IN_RELEASE 1
-
-#cmakedefine TESTS_DIR "@TESTS_DIR@"

examples/CMakeLists.txt

@@ -1,39 +1,50 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/
-)
+if(BUILD_EXAMPLES)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/  )
 
-if(NOT BUILD_SHARED_LIBS)
-  add_definitions(-DTAGLIB_STATIC)
-endif()
+if(ENABLE_STATIC)
+    add_definitions(-DTAGLIB_STATIC)
+endif(ENABLE_STATIC)
 
 ########### next target ###############
 
-add_executable(tagreader tagreader.cpp)
-target_link_libraries(tagreader tag)
+ADD_EXECUTABLE(tagreader tagreader.cpp)
+
+TARGET_LINK_LIBRARIES(tagreader  tag )
+
 
 ########### next target ###############
 
-add_executable(tagreader_c tagreader_c.c)
-target_link_libraries(tagreader_c tag_c)
+ADD_EXECUTABLE(tagreader_c tagreader_c.c)
+
+TARGET_LINK_LIBRARIES(tagreader_c  tag_c )
+
 
 ########### next target ###############
 
-add_executable(tagwriter tagwriter.cpp)
-target_link_libraries(tagwriter tag)
+ADD_EXECUTABLE(tagwriter tagwriter.cpp)
+
+TARGET_LINK_LIBRARIES(tagwriter  tag )
+
 
 ########### next target ###############
 
-add_executable(framelist framelist.cpp)
-target_link_libraries(framelist tag)
+ADD_EXECUTABLE(framelist framelist.cpp)
+
+TARGET_LINK_LIBRARIES(framelist  tag )
+
 
 ########### next target ###############
 
-add_executable(strip-id3v1 strip-id3v1.cpp)
-target_link_libraries(strip-id3v1 tag)
+ADD_EXECUTABLE(strip-id3v1 strip-id3v1.cpp)
+
+TARGET_LINK_LIBRARIES(strip-id3v1  tag )
+
+
+endif(BUILD_EXAMPLES)
 

examples/framelist.cpp

@@ -95,10 +95,7 @@ int main(int argc, char *argv[])
       for(APE::ItemListMap::ConstIterator it = ape->itemListMap().begin();
           it != ape->itemListMap().end(); ++it)
       {
-        if((*it).second.type() != APE::Item::Binary)
-          cout << (*it).first << " - \"" << (*it).second.toString() << "\"" << endl;
-        else
-          cout << (*it).first << " - Binary data (" << (*it).second.binaryData().size() << " bytes)" << endl;
+        cout << (*it).first << " - \"" << (*it).second.toString() << "\"" << endl;
       }
     }
     else

examples/tagreader.cpp

@@ -23,15 +23,20 @@
  */
 
 #include <iostream>
-#include <iomanip>
 #include <stdio.h>
 
 #include <fileref.h>
 #include <tag.h>
-#include <tpropertymap.h>
 
 using namespace std;
 
+TagLib::String formatSeconds(int seconds)
+{
+  char secondsString[3];
+  sprintf(secondsString, "%02i", seconds);
+  return secondsString;
+}
+
 int main(int argc, char *argv[])
 {
   for(int i = 1; i < argc; i++) {
@@ -44,7 +49,7 @@ int main(int argc, char *argv[])
 
       TagLib::Tag *tag = f.tag();
 
-      cout << "-- TAG (basic) --" << endl;
+      cout << "-- TAG --" << endl;
       cout << "title   - \"" << tag->title()   << "\"" << endl;
       cout << "artist  - \"" << tag->artist()  << "\"" << endl;
       cout << "album   - \"" << tag->album()   << "\"" << endl;
@@ -52,23 +57,6 @@ int main(int argc, char *argv[])
       cout << "comment - \"" << tag->comment() << "\"" << endl;
       cout << "track   - \"" << tag->track()   << "\"" << endl;
       cout << "genre   - \"" << tag->genre()   << "\"" << endl;
-
-      TagLib::PropertyMap tags = f.file()->properties();
-
-      unsigned int longest = 0;
-      for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-        if (i->first.size() > longest) {
-          longest = i->first.size();
-        }
-      }
-
-      cout << "-- TAG (properties) --" << endl;
-      for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-        for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
-          cout << left << std::setw(longest) << i->first << " - " << '"' << *j << '"' << endl;
-        }
-      }
-
     }
 
     if(!f.isNull() && f.audioProperties()) {
@@ -82,7 +70,7 @@ int main(int argc, char *argv[])
       cout << "bitrate     - " << properties->bitrate() << endl;
       cout << "sample rate - " << properties->sampleRate() << endl;
       cout << "channels    - " << properties->channels() << endl;
-      cout << "length      - " << minutes << ":" << setfill('0') << setw(2) << seconds << endl;
+      cout << "length      - " << minutes << ":" << formatSeconds(seconds) << endl;
     }
   }
   return 0;

examples/tagwriter.cpp

@@ -23,7 +23,6 @@
  */
 
 #include <iostream>
-#include <iomanip>
 #include <string.h>
 
 #include <stdio.h>
@@ -35,7 +34,6 @@
 #include <fileref.h>
 #include <tfile.h>
 #include <tag.h>
-#include <tpropertymap.h>
 
 using namespace std;
 
@@ -67,32 +65,11 @@ void usage()
   cout << "  -g <genre>"   << endl;
   cout << "  -y <year>"    << endl;
   cout << "  -T <track>"   << endl;
-  cout << "  -R <tagname> <tagvalue>"   << endl;
-  cout << "  -I <tagname> <tagvalue>"   << endl;
-  cout << "  -D <tagname>"   << endl;
   cout << endl;
 
   exit(1);
 }
 
-void checkForRejectedProperties(const TagLib::PropertyMap &tags)
-{ // stolen from tagreader.cpp
-  if(tags.size() > 0) {
-    unsigned int longest = 0;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-      if(i->first.size() > longest) {
-        longest = i->first.size();
-      }
-    }
-    cout << "-- rejected TAGs (properties) --" << endl;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-      for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
-        cout << left << std::setw(longest) << i->first << " - " << '"' << *j << '"' << endl;
-      }
-    }
-  }
-}
-
 int main(int argc, char *argv[])
 {
   TagLib::List<TagLib::FileRef> fileList;
@@ -117,7 +94,7 @@ int main(int argc, char *argv[])
       char field = argv[i][1];
       TagLib::String value = argv[i + 1];
 
-      TagLib::List<TagLib::FileRef>::ConstIterator it;
+      TagLib::List<TagLib::FileRef>::Iterator it;
       for(it = fileList.begin(); it != fileList.end(); ++it) {
 
         TagLib::Tag *t = (*it).tag();
@@ -144,29 +121,6 @@ int main(int argc, char *argv[])
         case 'T':
           t->setTrack(value.toInt());
           break;
-        case 'R':
-        case 'I':
-          if(i + 2 < argc) {
-            TagLib::PropertyMap map = (*it).file()->properties ();
-            if(field == 'R') {
-              map.replace(value, TagLib::String(argv[i + 2]));
-            }
-            else {
-              map.insert(value, TagLib::String(argv[i + 2]));
-            }
-            ++i;
-            checkForRejectedProperties((*it).file()->setProperties(map));
-          }
-          else {
-            usage();
-          }
-          break;
-        case 'D': {
-          TagLib::PropertyMap map = (*it).file()->properties();
-          map.erase(value);
-          checkForRejectedProperties((*it).file()->setProperties(map));
-          break;
-        }
         default:
           usage();
           break;
@@ -177,7 +131,7 @@ int main(int argc, char *argv[])
       usage();
   }
 
-  TagLib::List<TagLib::FileRef>::ConstIterator it;
+  TagLib::List<TagLib::FileRef>::Iterator it;
   for(it = fileList.begin(); it != fileList.end(); ++it)
     (*it).file()->save();
 

taglib-config.cmake

@@ -35,7 +35,7 @@ do
 	  flags="$flags -I$includedir/taglib"
 	  ;;
     --version)
-	  echo ${TAGLIB_LIB_VERSION_STRING}
+	  echo ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION} 
 	  ;;
     --prefix)
 	  echo $prefix

taglib-config.cmd.cmake

@@ -1,36 +0,0 @@
-@echo off
-goto beginning
-  *
-  * It is what it is, you can do with it as you please.
-  *
-  * Just don't blame me if it teaches your computer to smoke!
-  *
-  *  -Enjoy
-  *  fh :)_~
-  *
-:beginning
-if /i "%1#" == "--libs#"    goto doit
-if /i "%1#" == "--cflags#"  goto doit
-if /i "%1#" == "--version#" goto doit
-if /i "%1#" == "--prefix#"  goto doit
-
-echo "usage: %0 [OPTIONS]"
-echo	[--libs]
-echo	[--cflags]
-echo	[--version]
-echo	[--prefix]
-goto theend
-
-  *
-  * NOTE: Windows does not assume libraries are prefixed with 'lib'.
-  * NOTE: If '-llibtag' is the last element, it is easily appended in the users installation/makefile process
-  *       to allow for static, shared or debug builds.
-  * It would be preferable if the top level CMakeLists.txt provided the library name during config. ??
-:doit
-if /i "%1#" == "--libs#"    echo -L${LIB_INSTALL_DIR} -llibtag
-if /i "%1#" == "--cflags#"  echo -I${INCLUDE_INSTALL_DIR}/taglib
-if /i "%1#" == "--version#" echo ${TAGLIB_LIB_VERSION_STRING}
-if /i "%1#" == "--prefix#"  echo ${CMAKE_INSTALL_PREFIX}
-
-:theend
-

taglib.pc.cmake

@@ -1,11 +1,11 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@
+prefix=${CMAKE_INSTALL_PREFIX}
+exec_prefix=${CMAKE_INSTALL_PREFIX}
+libdir=${LIB_INSTALL_DIR}
+includedir=${INCLUDE_INSTALL_DIR}
 
 Name: TagLib
 Description: Audio meta-data library
 Requires: 
-Version: @TAGLIB_LIB_VERSION_STRING@
-Libs: -L${libdir} -ltag
-Cflags: -I${includedir}/taglib
+Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
+Libs: -L${LIB_INSTALL_DIR} -ltag
+Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 

taglib/CMakeLists.txt

@@ -10,7 +10,6 @@ include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/mp4
   ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
   ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/opus
   ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
   ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
   ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
@@ -28,12 +27,6 @@ include_directories(
 
 if(ZLIB_FOUND)
   include_directories(${ZLIB_INCLUDE_DIR})
-elseif(HAVE_ZLIB_SOURCE)
-  include_directories(${ZLIB_SOURCE})
-endif()
-
-if(HAVE_BOOST_BYTESWAP OR HAVE_BOOST_ATOMIC OR HAVE_BOOST_ZLIB)
-  include_directories(${Boost_INCLUDE_DIR})
 endif()
 
 set(tag_HDRS
@@ -41,7 +34,7 @@ set(tag_HDRS
   fileref.h
   audioproperties.h
   taglib_export.h
-  ${CMAKE_CURRENT_BINARY_DIR}/../taglib_config.h
+  ${CMAKE_BINARY_DIR}/taglib_config.h
   toolkit/taglib.h
   toolkit/tstring.h
   toolkit/tlist.h
@@ -55,9 +48,6 @@ set(tag_HDRS
   toolkit/tfilestream.h
   toolkit/tmap.h
   toolkit/tmap.tcc
-  toolkit/tpropertymap.h
-  toolkit/trefcounter.h
-  toolkit/tdebuglistener.h
   mpeg/mpegfile.h
   mpeg/mpegproperties.h
   mpeg/mpegheader.h
@@ -73,21 +63,15 @@ set(tag_HDRS
   mpeg/id3v2/id3v2tag.h
   mpeg/id3v2/frames/attachedpictureframe.h
   mpeg/id3v2/frames/commentsframe.h
-  mpeg/id3v2/frames/eventtimingcodesframe.h
   mpeg/id3v2/frames/generalencapsulatedobjectframe.h
-  mpeg/id3v2/frames/ownershipframe.h
   mpeg/id3v2/frames/popularimeterframe.h
   mpeg/id3v2/frames/privateframe.h
   mpeg/id3v2/frames/relativevolumeframe.h
-  mpeg/id3v2/frames/synchronizedlyricsframe.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
-  mpeg/id3v2/frames/chapterframe.h
-  mpeg/id3v2/frames/tableofcontentsframe.h
-  mpeg/id3v2/frames/podcastframe.h
   ogg/oggfile.h
   ogg/oggpage.h
   ogg/oggpageheader.h
@@ -97,8 +81,6 @@ set(tag_HDRS
   ogg/flac/oggflacfile.h
   ogg/speex/speexfile.h
   ogg/speex/speexproperties.h
-  ogg/opus/opusfile.h
-  ogg/opus/opusproperties.h
   flac/flacfile.h
   flac/flacpicture.h
   flac/flacproperties.h
@@ -119,7 +101,6 @@ set(tag_HDRS
   riff/aiff/aiffproperties.h
   riff/wav/wavfile.h
   riff/wav/wavproperties.h
-  riff/wav/infotag.h
   asf/asffile.h
   asf/asfproperties.h
   asf/asftag.h
@@ -168,21 +149,15 @@ set(id3v2_SRCS
 set(frames_SRCS
   mpeg/id3v2/frames/attachedpictureframe.cpp
   mpeg/id3v2/frames/commentsframe.cpp
-  mpeg/id3v2/frames/eventtimingcodesframe.cpp
   mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
-  mpeg/id3v2/frames/ownershipframe.cpp
   mpeg/id3v2/frames/popularimeterframe.cpp
   mpeg/id3v2/frames/privateframe.cpp
   mpeg/id3v2/frames/relativevolumeframe.cpp
-  mpeg/id3v2/frames/synchronizedlyricsframe.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
-  mpeg/id3v2/frames/chapterframe.cpp
-  mpeg/id3v2/frames/tableofcontentsframe.cpp
-  mpeg/id3v2/frames/podcastframe.cpp
 )
 
 set(ogg_SRCS
@@ -241,11 +216,6 @@ set(speex_SRCS
   ogg/speex/speexproperties.cpp
 )
 
-set(opus_SRCS
-  ogg/opus/opusfile.cpp
-  ogg/opus/opusproperties.cpp
-)
-
 set(trueaudio_SRCS
   trueaudio/trueaudiofile.cpp
   trueaudio/trueaudioproperties.cpp
@@ -271,7 +241,6 @@ set(aiff_SRCS
 set(wav_SRCS
   riff/wav/wavfile.cpp
   riff/wav/wavproperties.cpp
-  riff/wav/infotag.cpp
 )
 
 set(mod_SRCS
@@ -306,54 +275,24 @@ set(toolkit_SRCS
   toolkit/tfile.cpp
   toolkit/tfilestream.cpp
   toolkit/tdebug.cpp
-  toolkit/tpropertymap.cpp
-  toolkit/trefcounter.cpp
-  toolkit/tdebuglistener.cpp
-  toolkit/tzlib.cpp
+  toolkit/unicode.cpp
 )
 
-if(NOT WIN32)
-  set(unicode_SRCS
-    toolkit/unicode.cpp
-  )
-endif()
-
-if(HAVE_ZLIB_SOURCE)
-  set(zlib_SRCS
-    ${ZLIB_SOURCE}/adler32.c
-    ${ZLIB_SOURCE}/crc32.c
-    ${ZLIB_SOURCE}/inffast.c
-    ${ZLIB_SOURCE}/inflate.c
-    ${ZLIB_SOURCE}/inftrees.c
-    ${ZLIB_SOURCE}/zutil.c
-  )
-endif()
-
 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} ${opus_SRCS}
-  ${unicode_SRCS} ${zlib_SRCS}
+  ${asf_SRCS} ${mp4_SRCS} ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS}
   tag.cpp
   tagunion.cpp
   fileref.cpp
   audioproperties.cpp
-  tagutils.cpp
 )
 
 add_library(tag ${tag_LIB_SRCS} ${tag_HDRS})
 
 if(ZLIB_FOUND)
-  target_link_libraries(tag ${ZLIB_LIBRARIES})
-endif()
-
-if(HAVE_BOOST_ATOMIC)
-  target_link_libraries(tag ${Boost_ATOMIC_LIBRARY})
-endif()
-
-if(HAVE_BOOST_ZLIB)
-  target_link_libraries(tag ${Boost_IOSTREAMS_LIBRARY} ${Boost_ZLIB_LIBRARY})
+	target_link_libraries(tag ${ZLIB_LIBRARIES})
 endif()
 
 set_target_properties(tag PROPERTIES
@@ -369,9 +308,10 @@ if(BUILD_FRAMEWORK)
 endif()
 
 install(TARGETS tag
-  FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
-  LIBRARY DESTINATION ${LIB_INSTALL_DIR}
-  RUNTIME DESTINATION ${BIN_INSTALL_DIR}
-  ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
-  PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
+	FRAMEWORK DESTINATION ${FRAMEWORK_INSTALL_DIR}
+	LIBRARY DESTINATION ${LIB_INSTALL_DIR}
+	RUNTIME DESTINATION ${BIN_INSTALL_DIR}
+	ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
+	PUBLIC_HEADER DESTINATION ${INCLUDE_INSTALL_DIR}/taglib
 )
+

taglib/ape/apefile.cpp

@@ -36,11 +36,9 @@
 #include <tdebug.h>
 #include <tagunion.h>
 #include <id3v1tag.h>
-#include <id3v2header.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
 
 #include "apefile.h"
+
 #include "apetag.h"
 #include "apefooter.h"
 
@@ -48,7 +46,7 @@ using namespace TagLib;
 
 namespace
 {
-  enum { ApeAPEIndex = 0, ApeID3v1Index = 1 };
+  enum { APEIndex, ID3v1Index };
 }
 
 class APE::File::FilePrivate
@@ -58,49 +56,47 @@ public:
     APELocation(-1),
     APESize(0),
     ID3v1Location(-1),
-    ID3v2Header(0),
-    ID3v2Location(-1),
-    ID3v2Size(0),
-    properties(0) {}
+    properties(0),
+    hasAPE(false),
+    hasID3v1(false) {}
 
   ~FilePrivate()
   {
-    delete ID3v2Header;
     delete properties;
   }
 
   long APELocation;
-  long APESize;
+  uint APESize;
 
   long ID3v1Location;
 
-  ID3v2::Header *ID3v2Header;
-  long ID3v2Location;
-  long ID3v2Size;
-
   TagUnion tag;
 
   Properties *properties;
+
+  // These indicate whether the file *on disk* has these tags, not if
+  // this data structure does.  This is used in computing offsets.
+
+  bool hasAPE;
+  bool hasID3v1;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
+APE::File::File(FileName file, bool readProperties,
+                Properties::ReadStyle propertiesStyle) : TagLib::File(file)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
-APE::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate())
+APE::File::File(IOStream *stream, bool readProperties,
+                Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
 APE::File::~File()
@@ -113,24 +109,6 @@ TagLib::Tag *APE::File::tag() const
   return &d->tag;
 }
 
-PropertyMap APE::File::properties() const
-{
-  return d->tag.properties();
-}
-
-void APE::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag.removeUnsupportedProperties(properties);
-}
-
-PropertyMap APE::File::setProperties(const PropertyMap &properties)
-{
-  if(ID3v1Tag())
-    ID3v1Tag()->setProperties(properties);
-
-  return APETag(true)->setProperties(properties);
-}
-
 APE::Properties *APE::File::audioProperties() const
 {
   return d->properties;
@@ -145,158 +123,155 @@ bool APE::File::save()
 
   // Update ID3v1 tag
 
-  if(ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
-
-    // ID3v1 tag is not empty. Update the old one or create a new one.
-
-    if(d->ID3v1Location >= 0) {
+  if(ID3v1Tag()) {
+    if(d->hasID3v1) {
       seek(d->ID3v1Location);
+      writeBlock(ID3v1Tag()->render());
     }
     else {
       seek(0, End);
       d->ID3v1Location = tell();
+      writeBlock(ID3v1Tag()->render());
+      d->hasID3v1 = true;
     }
-
-    writeBlock(ID3v1Tag()->render());
   }
   else {
-
-    // ID3v1 tag is empty. Remove the old one.
-
-    if(d->ID3v1Location >= 0) {
-      truncate(d->ID3v1Location);
-      d->ID3v1Location = -1;
+    if(d->hasID3v1) {
+      removeBlock(d->ID3v1Location, 128);
+      d->hasID3v1 = false;
+      if(d->hasAPE) {
+        if(d->APELocation > d->ID3v1Location)
+          d->APELocation -= 128;
+      }
     }
   }
 
   // Update APE tag
 
-  if(APETag() && !APETag()->isEmpty()) {
-
-    // APE tag is not empty. Update the old one or create a new one.
-
-    if(d->APELocation < 0) {
-      if(d->ID3v1Location >= 0)
+  if(APETag()) {
+    if(d->hasAPE)
+      insert(APETag()->render(), d->APELocation, d->APESize);
+    else {
+      if(d->hasID3v1)  {
+        insert(APETag()->render(), d->ID3v1Location, 0);
+        d->APESize = APETag()->footer()->completeTagSize();
+        d->hasAPE = true;
         d->APELocation = d->ID3v1Location;
-      else
-        d->APELocation = length();
+        d->ID3v1Location += d->APESize;
+      }
+      else {
+        seek(0, End);
+        d->APELocation = tell();
+        writeBlock(APETag()->render());
+        d->APESize = APETag()->footer()->completeTagSize();
+        d->hasAPE = true;
+      }
     }
-
-    const ByteVector data = APETag()->render();
-    insert(data, d->APELocation, d->APESize);
-
-    if(d->ID3v1Location >= 0)
-      d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
-
-    d->APESize = data.size();
   }
   else {
-
-    // APE tag is empty. Remove the old one.
-
-    if(d->APELocation >= 0) {
+    if(d->hasAPE) {
       removeBlock(d->APELocation, d->APESize);
-
-      if(d->ID3v1Location >= 0)
-        d->ID3v1Location -= d->APESize;
-
-      d->APELocation = -1;
-      d->APESize = 0;
+      d->hasAPE = false;
+      if(d->hasID3v1) {
+        if(d->ID3v1Location > d->APELocation) {
+          d->ID3v1Location -= d->APESize;
+        }
+      }
     }
   }
 
-  return true;
+   return true;
 }
 
 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);
-
-  if(tags & APE)
-    d->tag.set(ApeAPEIndex, 0);
-
-  if(!ID3v1Tag())
+  if(tags & ID3v1) {
+    d->tag.set(ID3v1Index, 0);
     APETag(true);
-}
+  }
 
-bool APE::File::hasAPETag() const
-{
-  return (d->APELocation >= 0);
-}
+  if(tags & APE) {
+    d->tag.set(APEIndex, 0);
 
-bool APE::File::hasID3v1Tag() const
-{
-  return (d->ID3v1Location >= 0);
+    if(!ID3v1Tag())
+      APETag(true);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void APE::File::read(bool readProperties)
+void APE::File::read(bool readProperties, Properties::ReadStyle /* propertiesStyle */)
 {
-  // Look for an ID3v2 tag
-
-  d->ID3v2Location = Utils::findID3v2(this);
-
-  if(d->ID3v2Location >= 0) {
-    seek(d->ID3v2Location);
-    d->ID3v2Header = new ID3v2::Header(readBlock(ID3v2::Header::size()));
-    d->ID3v2Size = d->ID3v2Header->completeTagSize();
-  }
-
   // Look for an ID3v1 tag
 
-  d->ID3v1Location = Utils::findID3v1(this);
+  d->ID3v1Location = findID3v1();
 
-  if(d->ID3v1Location >= 0)
-    d->tag.set(ApeID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+  if(d->ID3v1Location >= 0) {
+    d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+    d->hasID3v1 = true;
+  }
 
   // Look for an APE tag
 
-  d->APELocation = Utils::findAPE(this, d->ID3v1Location);
+  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 + APE::Footer::size() - d->APESize;
+    d->APELocation = d->APELocation + APETag()->footer()->size() - d->APESize;
+    d->hasAPE = true;
   }
 
-  if(d->ID3v1Location < 0)
+  if(!d->hasID3v1)
     APETag(true);
 
   // Look for APE audio properties
 
   if(readProperties) {
-
-    long streamLength;
-
-    if(d->APELocation >= 0)
-      streamLength = d->APELocation;
-    else if(d->ID3v1Location >= 0)
-      streamLength = d->ID3v1Location;
-    else
-      streamLength = length();
-
-    if(d->ID3v2Location >= 0) {
-      seek(d->ID3v2Location + d->ID3v2Size);
-      streamLength -= (d->ID3v2Location + d->ID3v2Size);
-    }
-    else {
-      seek(0);
-    }
-
-    d->properties = new Properties(this, streamLength);
+    d->properties = new Properties(this);
   }
 }
+
+long APE::File::findAPE()
+{
+  if(!isValid())
+    return -1;
+
+  if(d->hasID3v1)
+    seek(-160, End);
+  else
+    seek(-32, End);
+
+  long p = tell();
+
+  if(readBlock(8) == APE::Tag::fileIdentifier())
+    return p;
+
+  return -1;
+}
+
+long APE::File::findID3v1()
+{
+  if(!isValid())
+    return -1;
+
+  seek(-128, End);
+  long p = tell();
+
+  if(readBlock(3) == ID3v1::Tag::fileIdentifier())
+    return p;
+
+  return -1;
+}

taglib/ape/apefile.h

@@ -59,7 +59,7 @@ namespace TagLib {
     //! An implementation of TagLib::File with APE specific methods
 
     /*!
-     * This implements and provides an interface for APE files to the
+     * This implements and provides an interface APE WavPack files to the
      * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
      * the abstract TagLib::File API as well as providing some additional
      * information specific to APE files.
@@ -84,22 +84,17 @@ namespace TagLib {
       };
 
       /*!
-       * Constructs an APE file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
+       * 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(FileName file, bool readProperties = true,
            Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
-       * Constructs an APE file from \a stream.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
+       * 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);
@@ -115,26 +110,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.
-       * Creates an APEv2 tag if necessary. A potentially existing ID3v1
-       * tag will be updated as well.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the APE::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.
@@ -152,38 +127,27 @@ namespace TagLib {
       /*!
        * Returns a pointer to the ID3v1 tag of the file.
        *
-       * If \a create is false (the default) this may return a null pointer
+       * If \a create is false (the default) this will return a null pointer
        * if there is no valid ID3v1 tag.  If \a create is true it will create
-       * an ID3v1 tag if one does not exist and returns a valid pointer.
+       * an ID3v1 tag if one does not exist. If there is already an APE tag, the
+       * new ID3v1 tag will be placed after it.
        *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an ID3v1 tag.  Use hasID3v1Tag() to check if the file
-       * on disk actually has an ID3v1 tag.
-       *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
+       * \note The Tag <b>is still</b> owned by the APE::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasID3v1Tag()
        */
       ID3v1::Tag *ID3v1Tag(bool create = false);
 
       /*!
        * Returns a pointer to the APE tag of the file.
        *
-       * If \a create is false (the default) this may return a null pointer
+       * If \a create is false (the default) this will return a null pointer
        * if there is no valid APE tag.  If \a create is true it will create
-       * an APE tag if one does not exist and returns a valid pointer.
+       * a APE tag if one does not exist.
        *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an APE tag.  Use hasAPETag() to check if the file
-       * on disk actually has an APE tag.
-       *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
+       * \note The Tag <b>is still</b> owned by the APE::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasAPETag()
        */
       APE::Tag *APETag(bool create = false);
 
@@ -197,25 +161,14 @@ namespace TagLib {
        */
       void strip(int tags = AllTags);
 
-      /*!
-       * Returns whether or not the file on disk actually has an APE tag.
-       *
-       * \see APETag()
-       */
-      bool hasAPETag() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v1 tag.
-       *
-       * \see ID3v1Tag()
-       */
-      bool hasID3v1Tag() const;
-
     private:
       File(const File &);
       File &operator=(const File &);
 
-      void read(bool readProperties);
+      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+      void scan();
+      long findID3v1();
+      long findAPE();
 
       class FilePrivate;
       FilePrivate *d;

taglib/ape/apefooter.cpp

@@ -24,7 +24,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <iostream>
+#include <ostream>
 #include <bitset>
 
 #include <tstring.h>
@@ -35,130 +35,132 @@
 using namespace TagLib;
 using namespace APE;
 
-class APE::Footer::FooterPrivate
+class Footer::FooterPrivate
 {
 public:
-  FooterPrivate() :
-    version(0),
-    footerPresent(true),
-    headerPresent(false),
-    isHeader(false),
-    itemCount(0),
-    tagSize(0) {}
+  FooterPrivate() : version(0),
+                    footerPresent(true),
+                    headerPresent(false),
+                    isHeader(false),
+                    itemCount(0),
+                    tagSize(0) {}
 
-  unsigned int version;
+  ~FooterPrivate() {}
+
+  uint version;
 
   bool footerPresent;
   bool headerPresent;
 
   bool isHeader;
 
-  unsigned int itemCount;
-  unsigned int tagSize;
+  uint itemCount;
+  uint tagSize;
+
+  static const uint size = 32;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members
 ////////////////////////////////////////////////////////////////////////////////
 
-unsigned int APE::Footer::size()
+TagLib::uint Footer::size()
 {
-  return 32;
+  return FooterPrivate::size;
 }
 
-ByteVector APE::Footer::fileIdentifier()
+ByteVector Footer::fileIdentifier()
 {
-  return ByteVector("APETAGEX");
+  return ByteVector::fromCString("APETAGEX");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Footer::Footer() :
-  d(new FooterPrivate())
+Footer::Footer()
 {
+  d = new FooterPrivate;
 }
 
-APE::Footer::Footer(const ByteVector &data) :
-  d(new FooterPrivate())
+Footer::Footer(const ByteVector &data)
 {
+  d = new FooterPrivate;
   parse(data);
 }
 
-APE::Footer::~Footer()
+Footer::~Footer()
 {
   delete d;
 }
 
-unsigned int 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;
 }
 
-unsigned int APE::Footer::itemCount() const
+TagLib::uint Footer::itemCount() const
 {
   return d->itemCount;
 }
 
-void APE::Footer::setItemCount(unsigned int s)
+void Footer::setItemCount(uint s)
 {
   d->itemCount = s;
 }
 
-unsigned int APE::Footer::tagSize() const
+TagLib::uint Footer::tagSize() const
 {
   return d->tagSize;
 }
 
-unsigned int APE::Footer::completeTagSize() const
+TagLib::uint Footer::completeTagSize() const
 {
   if(d->headerPresent)
-    return d->tagSize + size();
+    return d->tagSize + d->size;
   else
     return d->tagSize;
 }
 
-void APE::Footer::setTagSize(unsigned int 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);
+    return render(false);
 }
 
-ByteVector APE::Footer::renderHeader() const
+ByteVector Footer::renderHeader() const
 {
-  if(!d->headerPresent)
-    return ByteVector();
-  else
+    if (!d->headerPresent) return ByteVector();
+
     return render(true);
 }
 
@@ -166,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;
@@ -175,19 +177,19 @@ void APE::Footer::parse(const ByteVector &data)
 
   // Read the version number
 
-  d->version = data.toUInt(8, false);
+  d->version = data.mid(8, 4).toUInt(false);
 
   // Read the tag size
 
-  d->tagSize = data.toUInt(12, false);
+  d->tagSize = data.mid(12, 4).toUInt(false);
 
   // Read the item count
 
-  d->itemCount = data.toUInt(16, false);
+  d->itemCount = data.mid(16, 4).toUInt(false);
 
   // Read the flags
 
-  std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(data.toUInt(20, false)));
+  std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(data.mid(20, 4).toUInt(false)));
 
   d->headerPresent = flags[31];
   d->footerPresent = !flags[30];
@@ -195,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/apefooter.h

@@ -37,7 +37,7 @@ namespace TagLib {
 
     /*!
      * This class implements APE footers (and headers). It attempts to follow, both
-     * semantically and programmatically, the structure specified in
+     * semantically and programatically, the structure specified in
      * the APE v2.0 standard.  The API is based on the properties of APE footer and
      * headers specified there.
      */
@@ -64,7 +64,7 @@ namespace TagLib {
       /*!
        * Returns the version number.  (Note: This is the 1000 or 2000.)
        */
-      unsigned int version() const;
+      uint version() const;
 
       /*!
        * Returns true if a header is present in the tag.
@@ -89,13 +89,13 @@ namespace TagLib {
       /*!
        * Returns the number of items in the tag.
        */
-      unsigned int itemCount() const;
+      uint itemCount() const;
 
       /*!
        * Set the item count to \a s.
        * \see itemCount()
        */
-      void setItemCount(unsigned int s);
+      void setItemCount(uint s);
 
       /*!
        * Returns the tag size in bytes.  This is the size of the frame content and footer.
@@ -103,7 +103,7 @@ namespace TagLib {
        *
        * \see completeTagSize()
        */
-      unsigned int tagSize() const;
+      uint tagSize() const;
 
       /*!
        * Returns the tag size, including if present, the header
@@ -111,18 +111,18 @@ namespace TagLib {
        *
        * \see tagSize()
        */
-      unsigned int completeTagSize() const;
+      uint completeTagSize() const;
 
       /*!
        * Set the tag size to \a s.
        * \see tagSize()
        */
-      void setTagSize(unsigned int s);
+      void setTagSize(uint s);
 
       /*!
        * Returns the size of the footer.  Presently this is always 32 bytes.
        */
-      static unsigned int size();
+      static uint size();
 
       /*!
        * Returns the string used to identify an APE tag inside of a file.

taglib/ape/apeitem.cpp

@@ -34,9 +34,7 @@ using namespace APE;
 class APE::Item::ItemPrivate
 {
 public:
-  ItemPrivate() :
-    type(Text),
-    readOnly(false) {}
+  ItemPrivate() : type(Text), readOnly(false) {}
 
   Item::ItemTypes type;
   String key;
@@ -45,45 +43,28 @@ public:
   bool readOnly;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-APE::Item::Item() :
-  d(new ItemPrivate())
+APE::Item::Item()
 {
+  d = new ItemPrivate;
 }
 
-APE::Item::Item(const String &key, const String &value) :
-  d(new ItemPrivate())
+APE::Item::Item(const String &key, const String &value)
 {
+  d = new ItemPrivate;
   d->key = key;
   d->text.append(value);
 }
 
-APE::Item::Item(const String &key, const StringList &values) :
-  d(new ItemPrivate())
+APE::Item::Item(const String &key, const StringList &values)
 {
+  d = new ItemPrivate;
   d->key = key;
   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))
+APE::Item::Item(const Item &item)
 {
+  d = new ItemPrivate(*item.d);
 }
 
 APE::Item::~Item()
@@ -93,17 +74,11 @@ APE::Item::~Item()
 
 Item &APE::Item::operator=(const Item &item)
 {
-  Item(item).swap(*this);
+  delete d;
+  d = new ItemPrivate(*item.d);
   return *this;
 }
 
-void APE::Item::swap(Item &item)
-{
-  using std::swap;
-
-  swap(d, item.d);
-}
-
 void APE::Item::setReadOnly(bool readOnly)
 {
   d->readOnly = readOnly;
@@ -129,18 +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;
-  d->text.clear();
-}
-
 ByteVector APE::Item::value() const
 {
   // This seems incorrect as it won't be actually rendering the value to keep it
@@ -151,58 +114,32 @@ ByteVector APE::Item::value() const
 
 void APE::Item::setKey(const String &key)
 {
-  d->key = key;
+    d->key = key;
 }
 
 void APE::Item::setValue(const String &value)
 {
-  d->type = Text;
-  d->text = value;
-  d->value.clear();
+    d->text = value;
 }
 
 void APE::Item::setValues(const StringList &value)
 {
-  d->type = Text;
-  d->text = value;
-  d->value.clear();
+    d->text = value;
 }
 
 void APE::Item::appendValue(const String &value)
 {
-  d->type = Text;
-  d->text.append(value);
-  d->value.clear();
+    d->text.append(value);
 }
 
 void APE::Item::appendValues(const StringList &values)
 {
-  d->type = Text;
-  d->text.append(values);
-  d->value.clear();
+    d->text.append(values);
 }
 
 int APE::Item::size() const
 {
-  int result = 8 + d->key.size() + 1;
-  switch(d->type) {
-    case Text:
-      if(!d->text.isEmpty()) {
-        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
@@ -217,22 +154,19 @@ StringList APE::Item::values() const
 
 String APE::Item::toString() const
 {
-  if(d->type == Text && !isEmpty())
-    return d->text.front();
-  else
-    return String();
+  return isEmpty() ? String::null : d->text.front();
 }
 
 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:
@@ -249,29 +183,24 @@ void APE::Item::parse(const ByteVector &data)
     return;
   }
 
-  const unsigned int valueLength  = data.toUInt(0, false);
-  const unsigned int flags        = data.toUInt(4, false);
+  uint valueLength  = data.mid(0, 4).toUInt(false);
+  uint flags        = data.mid(4, 4).toUInt(false);
 
-  // An item key can contain ASCII characters from 0x20 up to 0x7E, not UTF-8.
-  // We assume that the validity of the given key has been checked.
+  d->key = String(data.mid(8), String::UTF8);
 
-  d->key = String(&data[8], String::Latin1);
-
-  const ByteVector value = data.mid(8 + d->key.size() + 1, valueLength);
+  d->value = data.mid(8 + d->key.size() + 1, valueLength);
 
   setReadOnly(flags & 1);
   setType(ItemTypes((flags >> 1) & 3));
 
-  if(Text == d->type)
-    d->text = StringList(ByteVectorList::split(value, '\0'), String::UTF8);
-  else
-    d->value = value;
+  if(int(d->type) < 2)
+    d->text = StringList(ByteVectorList::split(d->value, '\0'), String::UTF8);
 }
 
 ByteVector APE::Item::render() const
 {
   ByteVector data;
-  unsigned int flags = ((d->readOnly) ? 1 : 0) | (d->type << 1);
+  TagLib::uint flags = ((d->readOnly) ? 1 : 0) | (d->type << 1);
   ByteVector value;
 
   if(isEmpty())
@@ -293,7 +222,7 @@ ByteVector APE::Item::render() const
 
   data.append(ByteVector::fromUInt(value.size(), false));
   data.append(ByteVector::fromUInt(flags, false));
-  data.append(d->key.data(String::Latin1));
+  data.append(d->key.data(String::UTF8));
   data.append(ByteVector('\0'));
   data.append(value);
 

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.
        */
@@ -90,11 +84,6 @@ namespace TagLib {
        */
       Item &operator=(const Item &item);
 
-      /*!
-       * Exchanges the content of this item by the content of \a item.
-       */
-      void swap(Item &item);
-
       /*!
        * Returns the key.
        */
@@ -102,20 +91,12 @@ namespace TagLib {
 
       /*!
        * Returns the binary value.
-       * If the item type is not \a Binary, always returns an empty ByteVector.
+       *
+       * \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.
@@ -123,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()
@@ -138,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,20 +138,19 @@ namespace TagLib {
       int size() const;
 
       /*!
-       * Returns the value as a single string.  In case of multiple strings,
-       * the first is returned.  If the data type is not \a Text, always returns
-       * an empty String.
+       * Returns the value as a single string. In case of multiple strings,
+       * the first is returned.
        */
       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.  If the data type is not \a Text, always
-       * returns an empty StringList.
+       * Returns the list of values.
        */
       StringList values() const;
 

taglib/ape/apeproperties.cpp

@@ -33,22 +33,21 @@
 #include "id3v2tag.h"
 #include "apeproperties.h"
 #include "apefile.h"
-#include "apetag.h"
-#include "apefooter.h"
 
 using namespace TagLib;
 
 class APE::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate() :
+  PropertiesPrivate(File *file, long streamLength) :
     length(0),
     bitrate(0),
     sampleRate(0),
     channels(0),
     version(0),
     bitsPerSample(0),
-    sampleFrames(0) {}
+    file(file),
+    streamLength(streamLength) {}
 
   int length;
   int bitrate;
@@ -56,25 +55,18 @@ public:
   int channels;
   int version;
   int bitsPerSample;
-  unsigned int sampleFrames;
+  File *file;
+  long streamLength;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Properties::Properties(File *, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
+APE::Properties::Properties(File *file, ReadStyle style) : AudioProperties(style)
 {
-  debug("APE::Properties::Properties() -- This constructor is no longer used.");
-}
-
-APE::Properties::Properties(File *file, long streamLength, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
-  read(file, streamLength);
+  d = new PropertiesPrivate(file, file->length());
+  read();
 }
 
 APE::Properties::~Properties()
@@ -83,16 +75,6 @@ APE::Properties::~Properties()
 }
 
 int APE::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int APE::Properties::lengthInSeconds() const
-{
-  return d->length / 1000;
-}
-
-int APE::Properties::lengthInMilliseconds() const
 {
   return d->length;
 }
@@ -122,131 +104,121 @@ int APE::Properties::bitsPerSample() const
   return d->bitsPerSample;
 }
 
-unsigned int APE::Properties::sampleFrames() const
-{
-  return d->sampleFrames;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace
+
+void APE::Properties::read()
 {
-  int headerVersion(const ByteVector &header)
-  {
-    if(header.size() < 6 || !header.startsWith("MAC "))
-      return -1;
-
-    return header.toUShort(4, false);
-  }
-}
-
-void APE::Properties::read(File *file, long streamLength)
-{
-  // First, we assume that the file pointer is set at the first descriptor.
-  long offset = file->tell();
-  int version = headerVersion(file->readBlock(6));
-
-  // Next, we look for the descriptor.
-  if(version < 0) {
-    offset = file->find("MAC ", offset);
-    file->seek(offset);
-    version = headerVersion(file->readBlock(6));
-  }
-
-  if(version < 0) {
-    debug("APE::Properties::read() -- APE descriptor not found");
+  // First we are searching the descriptor
+  long offset = findDescriptor();
+  if(offset < 0)
     return;
+
+  // Then we read the header common for all versions of APE
+  d->file->seek(offset);
+  ByteVector commonHeader=d->file->readBlock(6);
+  if(!commonHeader.startsWith("MAC "))
+    return;
+  d->version = commonHeader.mid(4).toUInt(false);
+
+  if(d->version >= 3980) {
+    analyzeCurrent();
   }
-
-  d->version = version;
-
-  if(d->version >= 3980)
-    analyzeCurrent(file);
-  else
-    analyzeOld(file);
-
-  if(d->sampleFrames > 0 && d->sampleRate > 0) {
-    const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length  = static_cast<int>(length + 0.5);
-    d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
+  else {
+    analyzeOld();
   }
 }
 
-void APE::Properties::analyzeCurrent(File *file)
+long APE::Properties::findDescriptor()
+{
+  long ID3v2Location = findID3v2();
+  long ID3v2OriginalSize = 0;
+  bool hasID3v2 = false;
+  if(ID3v2Location >= 0) {
+    ID3v2::Tag tag(d->file, ID3v2Location, 0);
+    ID3v2OriginalSize = tag.header()->completeTagSize();
+    if(tag.header()->tagSize() > 0)
+      hasID3v2 = true;
+  }
+
+  long offset = 0;
+  if(hasID3v2)
+    offset = d->file->find("MAC ", ID3v2Location + ID3v2OriginalSize);
+  else
+    offset = d->file->find("MAC ");
+
+  if(offset < 0) {
+    debug("APE::Properties::findDescriptor() -- APE descriptor not found");
+    return -1;
+  }
+
+  return offset;
+}
+
+long APE::Properties::findID3v2()
+{
+  if(!d->file->isValid())
+    return -1;
+
+  d->file->seek(0);
+
+  if(d->file->readBlock(3) == ID3v2::Header::fileIdentifier())
+    return 0;
+
+  return -1;
+}
+
+void APE::Properties::analyzeCurrent()
 {
   // Read the descriptor
-  file->seek(2, File::Current);
-  const ByteVector descriptor = file->readBlock(44);
-  if(descriptor.size() < 44) {
-    debug("APE::Properties::analyzeCurrent() -- descriptor is too short.");
-    return;
-  }
+  d->file->seek(2, File::Current);
+  ByteVector descriptor = d->file->readBlock(44);
+  uint descriptorBytes = descriptor.mid(0,4).toUInt(false);
 
-  const unsigned int descriptorBytes = descriptor.toUInt(0, false);
-
-  if((descriptorBytes - 52) > 0)
-    file->seek(descriptorBytes - 52, File::Current);
+  if ((descriptorBytes - 52) > 0)
+    d->file->seek(descriptorBytes - 52, File::Current);
 
   // Read the header
-  const ByteVector header = file->readBlock(24);
-  if(header.size() < 24) {
-    debug("APE::Properties::analyzeCurrent() -- MAC header is too short.");
-    return;
-  }
+  ByteVector header = d->file->readBlock(24);
 
   // Get the APE info
-  d->channels      = header.toShort(18, false);
-  d->sampleRate    = header.toUInt(20, false);
-  d->bitsPerSample = header.toShort(16, false);
+  d->channels = header.mid(18, 2).toShort(false);
+  d->sampleRate = header.mid(20, 4).toUInt(false);
+  d->bitsPerSample = header.mid(16, 2).toShort(false);
+  //d->compressionLevel =
 
-  const unsigned int totalFrames = header.toUInt(12, false);
-  if(totalFrames == 0)
-    return;
-
-  const unsigned int blocksPerFrame   = header.toUInt(4, false);
-  const unsigned int finalFrameBlocks = header.toUInt(8, false);
-  d->sampleFrames = (totalFrames - 1) * blocksPerFrame + finalFrameBlocks;
+  uint totalFrames = header.mid(12, 4).toUInt(false);
+  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->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
 }
 
-void APE::Properties::analyzeOld(File *file)
+void APE::Properties::analyzeOld()
 {
-  const ByteVector header = file->readBlock(26);
-  if(header.size() < 26) {
-    debug("APE::Properties::analyzeOld() -- MAC header is too short.");
-    return;
-  }
-
-  const unsigned int totalFrames = header.toUInt(18, false);
+  ByteVector header = d->file->readBlock(26);
+  uint totalFrames = header.mid(18, 4).toUInt(false);
 
   // Fail on 0 length APE files (catches non-finalized APE files)
   if(totalFrames == 0)
     return;
 
-  const short compressionLevel = header.toShort(0, false);
-  unsigned int blocksPerFrame;
+  short compressionLevel = header.mid(0, 2).toShort(false);
+  uint blocksPerFrame;
   if(d->version >= 3950)
     blocksPerFrame = 73728 * 4;
   else if(d->version >= 3900 || (d->version >= 3800 && compressionLevel == 4000))
     blocksPerFrame = 73728;
   else
     blocksPerFrame = 9216;
-
-  // Get the APE info
-  d->channels   = header.toShort(4, false);
-  d->sampleRate = header.toUInt(6, false);
-
-  const unsigned int finalFrameBlocks = header.toUInt(22, false);
-  d->sampleFrames = (totalFrames - 1) * blocksPerFrame + finalFrameBlocks;
-
-  // Get the bit depth from the RIFF-fmt chunk.
-  file->seek(16, File::Current);
-  const ByteVector fmt = file->readBlock(28);
-  if(fmt.size() < 28 || !fmt.startsWith("WAVEfmt ")) {
-    debug("APE::Properties::analyzeOld() -- fmt header is too short.");
-    return;
-  }
-
-  d->bitsPerSample = fmt.toShort(26, false);
+  d->channels = header.mid(4, 2).toShort(false);
+  d->sampleRate = header.mid(6, 4).toUInt(false);
+  uint finalFrameBlocks = header.mid(22, 4).toUInt(false);
+  uint totalBlocks = totalFrames > 0 ? (totalFrames - 1) * blocksPerFrame + finalFrameBlocks : 0;
+  d->length = totalBlocks / d->sampleRate;
+  d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
 }
+

taglib/ape/apeproperties.h

@@ -51,75 +51,27 @@ namespace TagLib {
     public:
       /*!
        * Create an instance of APE::Properties with the data read from the
-       * APE::File \a file.
-       *
-       * \deprecated
+       * ByteVector \a data.
        */
-      Properties(File *file, ReadStyle style = Average);
-
-      /*!
-       * Create an instance of APE::Properties with the data read from the
-       * APE::File \a file.
-       */
-      Properties(File *file, long streamLength, ReadStyle style = Average);
+      Properties(File *f, ReadStyle style = Average);
 
       /*!
        * Destroys this APE::Properties instance.
        */
       virtual ~Properties();
 
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
+      // Reimplementations.
+
       virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \see lengthInMilliseconds()
-       */
-      // BIC: make virtual
-      int lengthInSeconds() const;
-
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
-
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
       virtual int bitrate() const;
-
-      /*!
-       * Returns the sample rate in Hz.
-       */
       virtual int sampleRate() const;
-
-      /*!
-       * Returns the number of audio channels.
-       */
       virtual int channels() const;
 
       /*!
-       * Returns the number of bits per audio sample.
+       * Returns number of bits per sample.
        */
       int bitsPerSample() const;
 
-      /*!
-       * Returns the total number of audio samples in file.
-       */
-      unsigned int sampleFrames() const;
-
       /*!
        * Returns APE version.
        */
@@ -129,10 +81,13 @@ namespace TagLib {
       Properties(const Properties &);
       Properties &operator=(const Properties &);
 
-      void read(File *file, long streamLength);
+      void read();
 
-      void analyzeCurrent(File *file);
-      void analyzeOld(File *file);
+      long findDescriptor();
+      long findID3v2();
+
+      void analyzeCurrent();
+      void analyzeOld();
 
       class PropertiesPrivate;
       PropertiesPrivate *d;

taglib/ape/apetag.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#if defined(__SUNPRO_CC) && (__SUNPRO_CC < 0x5130)
+#ifdef __SUNPRO_CC
 // Sun Studio finds multiple specializations of Map because
 // it considers specializations with and without class types
 // to be different; this define forces Map to use only the
@@ -34,9 +34,6 @@
 #include <tfile.h>
 #include <tstring.h>
 #include <tmap.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
-#include <tutils.h>
 
 #include "apetag.h"
 #include "apefooter.h"
@@ -45,43 +42,17 @@
 using namespace TagLib;
 using namespace APE;
 
-namespace
-{
-  bool isKeyValid(const char *key, size_t length)
-  {
-    const char *invalidKeys[] = { "ID3", "TAG", "OGGS", "MP+", 0 };
-
-    if(length < 2 || length > 16)
-      return false;
-
-    // only allow printable ASCII including space (32..126)
-
-    for(const char *p = key; p < key + length; ++p) {
-      const int c = static_cast<unsigned char>(*p);
-      if(c < 32 || c > 126)
-        return false;
-    }
-
-    for(size_t i = 0; invalidKeys[i] != 0; ++i) {
-      if(Utils::equalsIgnoreCase(key, invalidKeys[i]))
-        return false;
-    }
-
-    return true;
-  }
-}
-
 class APE::Tag::TagPrivate
 {
 public:
-  TagPrivate() :
-    file(0),
-    footerLocation(0) {}
+  TagPrivate() : file(0), footerLocation(-1), tagLength(0) {}
 
   File *file;
   long footerLocation;
+  long tagLength;
 
   Footer footer;
+
   ItemListMap itemListMap;
 };
 
@@ -89,16 +60,14 @@ public:
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-APE::Tag::Tag() :
-  TagLib::Tag(),
-  d(new TagPrivate())
+APE::Tag::Tag() : TagLib::Tag()
 {
+  d = new TagPrivate;
 }
 
-APE::Tag::Tag(TagLib::File *file, long footerLocation) :
-  TagLib::Tag(),
-  d(new TagPrivate())
+APE::Tag::Tag(File *file, long footerLocation) : TagLib::Tag()
 {
+  d = new TagPrivate;
   d->file = file;
   d->footerLocation = footerLocation;
 
@@ -118,46 +87,46 @@ ByteVector APE::Tag::fileIdentifier()
 String APE::Tag::title() const
 {
   if(d->itemListMap["TITLE"].isEmpty())
-    return String();
-  return d->itemListMap["TITLE"].values().toString();
+    return String::null;
+  return d->itemListMap["TITLE"].toString();
 }
 
 String APE::Tag::artist() const
 {
   if(d->itemListMap["ARTIST"].isEmpty())
-    return String();
-  return d->itemListMap["ARTIST"].values().toString();
+    return String::null;
+  return d->itemListMap["ARTIST"].toString();
 }
 
 String APE::Tag::album() const
 {
   if(d->itemListMap["ALBUM"].isEmpty())
-    return String();
-  return d->itemListMap["ALBUM"].values().toString();
+    return String::null;
+  return d->itemListMap["ALBUM"].toString();
 }
 
 String APE::Tag::comment() const
 {
   if(d->itemListMap["COMMENT"].isEmpty())
-    return String();
-  return d->itemListMap["COMMENT"].values().toString();
+    return String::null;
+  return d->itemListMap["COMMENT"].toString();
 }
 
 String APE::Tag::genre() const
 {
   if(d->itemListMap["GENRE"].isEmpty())
-    return String();
-  return d->itemListMap["GENRE"].values().toString();
+    return String::null;
+  return d->itemListMap["GENRE"].toString();
 }
 
-unsigned int APE::Tag::year() const
+TagLib::uint APE::Tag::year() const
 {
   if(d->itemListMap["YEAR"].isEmpty())
     return 0;
   return d->itemListMap["YEAR"].toString().toInt();
 }
 
-unsigned int APE::Tag::track() const
+TagLib::uint APE::Tag::track() const
 {
   if(d->itemListMap["TRACK"].isEmpty())
     return 0;
@@ -189,7 +158,7 @@ void APE::Tag::setGenre(const String &s)
   addValue("GENRE", s, true);
 }
 
-void APE::Tag::setYear(unsigned int i)
+void APE::Tag::setYear(uint i)
 {
   if(i <= 0)
     removeItem("YEAR");
@@ -197,7 +166,7 @@ void APE::Tag::setYear(unsigned int i)
     addValue("YEAR", String::number(i), true);
 }
 
-void APE::Tag::setTrack(unsigned int i)
+void APE::Tag::setTrack(uint i)
 {
   if(i <= 0)
     removeItem("TRACK");
@@ -205,104 +174,6 @@ void APE::Tag::setTrack(unsigned int i)
     addValue("TRACK", String::number(i), true);
 }
 
-namespace
-{
-  // conversions of tag keys between what we use in PropertyMap and what's usual
-  // for APE tags
-  //                                    usual,         APE
-  const char *keyConversions[][2] =  {{"TRACKNUMBER", "TRACK"       },
-                                      {"DATE",        "YEAR"        },
-                                      {"ALBUMARTIST", "ALBUM ARTIST"},
-                                      {"DISCNUMBER",  "DISC"        },
-                                      {"REMIXER",     "MIXARTIST"   }};
-  const size_t keyConversionsSize = sizeof(keyConversions) / sizeof(keyConversions[0]);
-}
-
-PropertyMap APE::Tag::properties() const
-{
-  PropertyMap properties;
-  ItemListMap::ConstIterator it = itemListMap().begin();
-  for(; it != itemListMap().end(); ++it) {
-    String tagName = it->first.upper();
-    // 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.isEmpty()) {
-      properties.unsupportedData().append(it->first);
-    }
-    else {
-      // Some tags need to be handled specially
-      for(size_t 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(size_t 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 = remIt->first.upper();
-    // only remove if a) key is valid, b) type is text, c) key not contained in new properties
-    if(!key.isEmpty() && remIt->second.type() == APE::Item::Text && !properties.contains(key))
-      toRemove.append(remIt->first);
-  }
-
-  for(StringList::ConstIterator removeIt = toRemove.begin(); removeIt != toRemove.end(); removeIt++)
-    removeItem(*removeIt);
-
-  // now sync in the "forward direction"
-  PropertyMap::ConstIterator it = properties.begin();
-  PropertyMap invalid;
-  for(; it != properties.end(); ++it) {
-    const String &tagName = it->first;
-    if(!checkKey(tagName))
-      invalid.insert(it->first, it->second);
-    else if(!(itemListMap().contains(tagName)) || !(itemListMap()[tagName].values() == it->second)) {
-      if(it->second.isEmpty())
-        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 invalid;
-}
-
-bool APE::Tag::checkKey(const String &key)
-{
-  if(!key.isLatin1())
-    return false;
-
-  const std::string data = key.to8Bit(false);
-  return isKeyValid(data.c_str(), data.size());
-}
-
 APE::Footer *APE::Tag::footer() const
 {
   return &d->footer;
@@ -315,46 +186,26 @@ const APE::ItemListMap& APE::Tag::itemListMap() const
 
 void APE::Tag::removeItem(const String &key)
 {
-  d->itemListMap.erase(key.upper());
+  Map<const String, Item>::Iterator it = d->itemListMap.find(key.upper());
+  if(it != d->itemListMap.end())
+    d->itemListMap.erase(it);
 }
 
 void APE::Tag::addValue(const String &key, const String &value, bool replace)
 {
   if(replace)
     removeItem(key);
-
-  if(value.isEmpty())
-    return;
-
-  // Text items may contain more than one value.
-  // Binary or locator items may have only one value, hence always replaced.
-
-  ItemListMap::Iterator it = d->itemListMap.find(key.upper());
-
-  if(it != d->itemListMap.end() && it->second.type() == Item::Text)
-    it->second.appendValue(value);
-  else
-    setItem(key, Item(key, value));
-}
-
-void APE::Tag::setData(const String &key, const ByteVector &value)
-{
-  removeItem(key);
-
-  if(value.isEmpty())
-    return;
-
-  setItem(key, Item(key, value, true));
+  if(!value.isEmpty()) {
+    if(d->itemListMap.contains(key) || !replace)
+      d->itemListMap[key.upper()].appendValue(value);
+    else
+      setItem(key, Item(key, value));
+  }
 }
 
 void APE::Tag::setItem(const String &key, const Item &item)
 {
-  if(!checkKey(key)) {
-    debug("APE::Tag::setItem() - Couldn't set an item due to an invalid key.");
-    return;
-  }
-
-  d->itemListMap[key.upper()] = item;
+  d->itemListMap.insert(key.upper(), item);
 }
 
 bool APE::Tag::isEmpty() const
@@ -374,7 +225,7 @@ void APE::Tag::read()
     d->footer.setData(d->file->readBlock(Footer::size()));
 
     if(d->footer.tagSize() <= Footer::size() ||
-       d->footer.tagSize() > static_cast<unsigned long>(d->file->length()))
+       d->footer.tagSize() > uint(d->file->length()))
       return;
 
     d->file->seek(d->footerLocation + Footer::size() - d->footer.tagSize());
@@ -385,11 +236,15 @@ void APE::Tag::read()
 ByteVector APE::Tag::render() const
 {
   ByteVector data;
-  unsigned int itemCount = 0;
+  uint itemCount = 0;
 
-  for(ItemListMap::ConstIterator it = d->itemListMap.begin(); it != d->itemListMap.end(); ++it) {
-    data.append(it->second.render());
-    itemCount++;
+  {
+    for(Map<const String, Item>::ConstIterator it = d->itemListMap.begin();
+        it != d->itemListMap.end(); ++it)
+    {
+      data.append(it->second.render());
+      itemCount++;
+    }
   }
 
   d->footer.setItemCount(itemCount);
@@ -401,34 +256,16 @@ ByteVector APE::Tag::render() const
 
 void APE::Tag::parse(const ByteVector &data)
 {
+  uint pos = 0;
+
   // 11 bytes is the minimum size for an APE item
 
-  if(data.size() < 11)
-    return;
+  for(uint i = 0; i < d->footer.itemCount() && pos <= data.size() - 11; i++) {
+    APE::Item item;
+    item.parse(data.mid(pos));
 
-  unsigned int pos = 0;
+    d->itemListMap.insert(item.key().upper(), item);
 
-  for(unsigned int i = 0; i < d->footer.itemCount() && pos <= data.size() - 11; i++) {
-
-    const int nullPos = data.find('\0', pos + 8);
-    if(nullPos < 0) {
-      debug("APE::Tag::parse() - Couldn't find a key/value separator. Stopped parsing.");
-      return;
-    }
-
-    const unsigned int keyLength = nullPos - pos - 8;
-    const unsigned int valLegnth = data.toUInt(pos, false);
-
-    if(isKeyValid(&data[pos + 8], keyLength)){
-      APE::Item item;
-      item.parse(data.mid(pos));
-
-      d->itemListMap.insert(item.key().upper(), item);
-    }
-    else {
-      debug("APE::Tag::parse() - Skipped an item due to an invalid key.");
-    }
-
-    pos += keyLength + valLegnth + 9;
+    pos += item.size();
   }
 }

taglib/ape/apetag.h

@@ -92,47 +92,16 @@ namespace TagLib {
       virtual String album() const;
       virtual String comment() const;
       virtual String genre() const;
-      virtual unsigned int year() const;
-      virtual unsigned int track() const;
+      virtual uint year() const;
+      virtual uint track() const;
 
       virtual void setTitle(const String &s);
       virtual void setArtist(const String &s);
       virtual void setAlbum(const String &s);
       virtual void setComment(const String &s);
       virtual void setGenre(const String &s);
-      virtual void setYear(unsigned int i);
-      virtual void setTrack(unsigned int 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; additionally note that the APE tag
-       * specification requires keys to have between 2 and 16 printable ASCII characters
-       * with the exception of the fixed strings "ID3", "TAG", "OGGS", and "MP+".
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
-      /*!
-       * Check if the given String is a valid APE tag key.
-       */
-      static bool checkKey(const String&);
+      virtual void setYear(uint i);
+      virtual void setTrack(uint i);
 
       /*!
        * Returns a pointer to the tag's footer.
@@ -143,7 +112,7 @@ namespace TagLib {
        * Returns a reference to the item list map.  This is an ItemListMap of
        * all of the items in the tag.
        *
-       * This is the most powerful structure for accessing the items of the tag.
+       * This is the most powerfull structure for accessing the items of the tag.
        *
        * APE tags are case-insensitive, all keys in this map have been converted
        * to upper case.
@@ -159,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/asfattribute.cpp

@@ -23,13 +23,14 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
-#include <trefcounter.h>
-
 #include "asfattribute.h"
 #include "asffile.h"
-#include "asfutils.h"
 
 using namespace TagLib;
 
@@ -58,86 +59,82 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::Attribute::Attribute() :
-  d(new AttributePrivate())
+ASF::Attribute::Attribute()
 {
+  d = new AttributePrivate;
   d->type = UnicodeType;
 }
 
-ASF::Attribute::Attribute(const ASF::Attribute &other) :
-  d(other.d)
+ASF::Attribute::Attribute(const ASF::Attribute &other)
+  : d(other.d)
 {
   d->ref();
 }
 
-ASF::Attribute::Attribute(const String &value) :
-  d(new AttributePrivate())
-{
-  d->type = UnicodeType;
-  d->stringValue = value;
-}
-
-ASF::Attribute::Attribute(const ByteVector &value) :
-  d(new AttributePrivate())
-{
-  d->type = BytesType;
-  d->byteVectorValue = value;
-}
-
-ASF::Attribute::Attribute(const ASF::Picture &value) :
-  d(new AttributePrivate())
-{
-  d->type = BytesType;
-  d->pictureValue = value;
-}
-
-ASF::Attribute::Attribute(unsigned int value) :
-  d(new AttributePrivate())
-{
-  d->type = DWordType;
-  d->intValue = value;
-}
-
-ASF::Attribute::Attribute(unsigned long long value) :
-  d(new AttributePrivate())
-{
-  d->type = QWordType;
-  d->longLongValue = value;
-}
-
-ASF::Attribute::Attribute(unsigned short value) :
-  d(new AttributePrivate())
-{
-  d->type = WordType;
-  d->shortValue = value;
-}
-
-ASF::Attribute::Attribute(bool value) :
-  d(new AttributePrivate())
-{
-  d->type = BoolType;
-  d->boolValue = value;
-}
-
 ASF::Attribute &ASF::Attribute::operator=(const ASF::Attribute &other)
 {
-  Attribute(other).swap(*this);
+  if(d->deref())
+    delete d;
+  d = other.d;
+  d->ref();
   return *this;
 }
 
-void ASF::Attribute::swap(Attribute &other)
-{
-  using std::swap;
-
-  swap(d, other.d);
-}
-
 ASF::Attribute::~Attribute()
 {
   if(d->deref())
     delete d;
 }
 
+ASF::Attribute::Attribute(const String &value)
+{
+  d = new AttributePrivate;
+  d->type = UnicodeType;
+  d->stringValue = value;
+}
+
+ASF::Attribute::Attribute(const ByteVector &value)
+{
+  d = new AttributePrivate;
+  d->type = BytesType;
+  d->byteVectorValue = value;
+}
+
+ASF::Attribute::Attribute(const ASF::Picture &value)
+{
+  d = new AttributePrivate;
+  d->type = BytesType;
+  d->pictureValue = value;
+}
+
+ASF::Attribute::Attribute(unsigned int value)
+{
+  d = new AttributePrivate;
+  d->type = DWordType;
+  d->intValue = value;
+}
+
+ASF::Attribute::Attribute(unsigned long long value)
+{
+  d = new AttributePrivate;
+  d->type = QWordType;
+  d->longLongValue = value;
+}
+
+ASF::Attribute::Attribute(unsigned short value)
+{
+  d = new AttributePrivate;
+  d->type = WordType;
+  d->shortValue = value;
+}
+
+ASF::Attribute::Attribute(bool value)
+{
+  d = new AttributePrivate;
+  d->type = BoolType;
+  d->boolValue = value;
+}
+
 ASF::Attribute::AttributeTypes ASF::Attribute::type() const
 {
   return d->type;
@@ -182,28 +179,28 @@ ASF::Picture ASF::Attribute::toPicture() const
 
 String ASF::Attribute::parse(ASF::File &f, int kind)
 {
-  unsigned int size, nameLength;
+  uint size, nameLength;
   String name;
   d->pictureValue = Picture::fromInvalid();
   // extended content descriptor
   if(kind == 0) {
-    nameLength = readWORD(&f);
-    name = readString(&f, nameLength);
-    d->type = ASF::Attribute::AttributeTypes(readWORD(&f));
-    size = readWORD(&f);
+    nameLength = f.readWORD();
+    name = f.readString(nameLength);
+    d->type = ASF::Attribute::AttributeTypes(f.readWORD());
+    size = f.readWORD();
   }
   // metadata & metadata library
   else {
-    int temp = readWORD(&f);
+    int temp = f.readWORD();
     // metadata library
     if(kind == 2) {
       d->language = temp;
     }
-    d->stream = readWORD(&f);
-    nameLength = readWORD(&f);
-    d->type = ASF::Attribute::AttributeTypes(readWORD(&f));
-    size = readDWORD(&f);
-    name = readString(&f, nameLength);
+    d->stream = f.readWORD();
+    nameLength = f.readWORD();
+    d->type = ASF::Attribute::AttributeTypes(f.readWORD());
+    size = f.readDWORD();
+    name = f.readString(nameLength);
   }
 
   if(kind != 2 && size > 65535) {
@@ -212,28 +209,28 @@ String ASF::Attribute::parse(ASF::File &f, int kind)
 
   switch(d->type) {
   case WordType:
-    d->shortValue = readWORD(&f);
+    d->shortValue = f.readWORD();
     break;
 
   case BoolType:
     if(kind == 0) {
-      d->boolValue = (readDWORD(&f) == 1);
+      d->boolValue = f.readDWORD() == 1;
     }
     else {
-      d->boolValue = (readWORD(&f) == 1);
+      d->boolValue = f.readWORD() == 1;
     }
     break;
 
   case DWordType:
-    d->intValue = readDWORD(&f);
+    d->intValue = f.readDWORD();
     break;
 
   case QWordType:
-    d->longLongValue = readQWORD(&f);
+    d->longLongValue = f.readQWORD();
     break;
 
   case UnicodeType:
-    d->stringValue = readString(&f, size);
+    d->stringValue = f.readString(size);
     break;
 
   case BytesType:
@@ -301,7 +298,7 @@ ByteVector ASF::Attribute::render(const String &name, int kind) const
     break;
 
   case UnicodeType:
-    data.append(renderString(d->stringValue));
+    data.append(File::renderString(d->stringValue));
     break;
 
   case BytesType:
@@ -315,13 +312,13 @@ ByteVector ASF::Attribute::render(const String &name, int kind) const
   }
 
   if(kind == 0) {
-    data = renderString(name, true) +
+    data = File::renderString(name, true) +
            ByteVector::fromShort((int)d->type, false) +
            ByteVector::fromShort(data.size(), false) +
            data;
   }
   else {
-    ByteVector nameData = renderString(name);
+    ByteVector nameData = File::renderString(name);
     data = ByteVector::fromShort(kind == 2 ? d->language : 0, false) +
            ByteVector::fromShort(d->stream, false) +
            ByteVector::fromShort(nameData.size(), false) +
@@ -353,3 +350,4 @@ void ASF::Attribute::setStream(int value)
 {
   d->stream = value;
 }
+

taglib/asf/asfattribute.h

@@ -70,7 +70,7 @@ namespace TagLib
       /*!
        * Constructs an attribute with \a key and a BytesType \a value.
        */
-      Attribute(const ByteVector &value);
+      Attribute(const ByteVector &value);      
 
       /*!
        * Constructs an attribute with \a key and a Picture \a value.
@@ -115,11 +115,6 @@ namespace TagLib
        */
       ASF::Attribute &operator=(const Attribute &other);
 
-      /*!
-       * Exchanges the content of the Attribute by the content of \a other.
-       */
-      void swap(Attribute &other);
-
       /*!
        * Destroys the attribute.
        */

taglib/asf/asffile.cpp

@@ -23,261 +23,204 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdebug.h>
 #include <tbytevectorlist.h>
-#include <tpropertymap.h>
 #include <tstring.h>
-
 #include "asffile.h"
 #include "asftag.h"
 #include "asfproperties.h"
-#include "asfutils.h"
 
 using namespace TagLib;
 
 class ASF::File::FilePrivate
 {
 public:
-  class BaseObject;
-  class UnknownObject;
-  class FilePropertiesObject;
-  class StreamPropertiesObject;
-  class ContentDescriptionObject;
-  class ExtendedContentDescriptionObject;
-  class HeaderExtensionObject;
-  class CodecListObject;
-  class MetadataObject;
-  class MetadataLibraryObject;
-
   FilePrivate():
-    headerSize(0),
+    size(0),
     tag(0),
     properties(0),
     contentDescriptionObject(0),
     extendedContentDescriptionObject(0),
     headerExtensionObject(0),
     metadataObject(0),
-    metadataLibraryObject(0)
-  {
-    objects.setAutoDelete(true);
-  }
-
-  ~FilePrivate()
-  {
-    delete tag;
-    delete properties;
-  }
-
-  unsigned long long headerSize;
-
+    metadataLibraryObject(0) {}
+  unsigned long long size;
   ASF::Tag *tag;
   ASF::Properties *properties;
-
-  List<BaseObject *> objects;
-
-  ContentDescriptionObject         *contentDescriptionObject;
-  ExtendedContentDescriptionObject *extendedContentDescriptionObject;
-  HeaderExtensionObject            *headerExtensionObject;
-  MetadataObject                   *metadataObject;
-  MetadataLibraryObject            *metadataLibraryObject;
+  List<ASF::File::BaseObject *> objects;
+  ASF::File::ContentDescriptionObject *contentDescriptionObject;
+  ASF::File::ExtendedContentDescriptionObject *extendedContentDescriptionObject;
+  ASF::File::HeaderExtensionObject *headerExtensionObject;
+  ASF::File::MetadataObject *metadataObject;
+  ASF::File::MetadataLibraryObject *metadataLibraryObject;
 };
 
-namespace
-{
-  const ByteVector headerGuid("\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
-  const ByteVector filePropertiesGuid("\xA1\xDC\xAB\x8C\x47\xA9\xCF\x11\x8E\xE4\x00\xC0\x0C\x20\x53\x65", 16);
-  const ByteVector streamPropertiesGuid("\x91\x07\xDC\xB7\xB7\xA9\xCF\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65", 16);
-  const ByteVector contentDescriptionGuid("\x33\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
-  const ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x11\x97\xF0\x00\xA0\xC9\x5E\xA8\x50", 16);
-  const ByteVector headerExtensionGuid("\xb5\x03\xbf_.\xa9\xcf\x11\x8e\xe3\x00\xc0\x0c Se", 16);
-  const ByteVector metadataGuid("\xEA\xCB\xF8\xC5\xAF[wH\204g\xAA\214D\xFAL\xCA", 16);
-  const ByteVector metadataLibraryGuid("\224\034#D\230\224\321I\241A\x1d\x13NEpT", 16);
-  const ByteVector codecListGuid("\x40\x52\xd1\x86\x1d\x31\xd0\x11\xa3\xa4\x00\xa0\xc9\x03\x48\xf6", 16);
-  const ByteVector contentEncryptionGuid("\xFB\xB3\x11\x22\x23\xBD\xD2\x11\xB4\xB7\x00\xA0\xC9\x55\xFC\x6E", 16);
-  const ByteVector extendedContentEncryptionGuid("\x14\xE6\x8A\x29\x22\x26 \x17\x4C\xB9\x35\xDA\xE0\x7E\xE9\x28\x9C", 16);
-  const ByteVector advancedContentEncryptionGuid("\xB6\x9B\x07\x7A\xA4\xDA\x12\x4E\xA5\xCA\x91\xD3\x8D\xC1\x1A\x8D", 16);
-}
+static ByteVector headerGuid("\x30\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
+static ByteVector filePropertiesGuid("\xA1\xDC\xAB\x8C\x47\xA9\xCF\x11\x8E\xE4\x00\xC0\x0C\x20\x53\x65", 16);
+static ByteVector streamPropertiesGuid("\x91\x07\xDC\xB7\xB7\xA9\xCF\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65", 16);
+static ByteVector contentDescriptionGuid("\x33\x26\xB2\x75\x8E\x66\xCF\x11\xA6\xD9\x00\xAA\x00\x62\xCE\x6C", 16);
+static ByteVector extendedContentDescriptionGuid("\x40\xA4\xD0\xD2\x07\xE3\xD2\x11\x97\xF0\x00\xA0\xC9\x5E\xA8\x50", 16);
+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::FilePrivate::BaseObject
+class ASF::File::BaseObject
 {
 public:
   ByteVector data;
   virtual ~BaseObject() {}
-  virtual ByteVector guid() const = 0;
+  virtual ByteVector guid() = 0;
   virtual void parse(ASF::File *file, unsigned int size);
   virtual ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::UnknownObject : public ASF::File::BaseObject
 {
   ByteVector myGuid;
 public:
   UnknownObject(const ByteVector &guid);
-  ByteVector guid() const;
+  ByteVector guid();
 };
 
-class ASF::File::FilePrivate::FilePropertiesObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::FilePropertiesObject : public ASF::File::BaseObject
 {
 public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
 };
 
-class ASF::File::FilePrivate::StreamPropertiesObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::StreamPropertiesObject : public ASF::File::BaseObject
 {
 public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
 };
 
-class ASF::File::FilePrivate::ContentDescriptionObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::ContentDescriptionObject : public ASF::File::BaseObject
 {
 public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
   ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::ExtendedContentDescriptionObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::ExtendedContentDescriptionObject : public ASF::File::BaseObject
 {
 public:
   ByteVectorList attributeData;
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
   ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::MetadataObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::MetadataObject : public ASF::File::BaseObject
 {
 public:
   ByteVectorList attributeData;
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
   ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::MetadataLibraryObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::MetadataLibraryObject : public ASF::File::BaseObject
 {
 public:
   ByteVectorList attributeData;
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
   ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::HeaderExtensionObject : public ASF::File::FilePrivate::BaseObject
+class ASF::File::HeaderExtensionObject : public ASF::File::BaseObject
 {
 public:
-  List<ASF::File::FilePrivate::BaseObject *> objects;
-  HeaderExtensionObject();
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
+  List<ASF::File::BaseObject *> objects;
+  ByteVector guid();
+  void parse(ASF::File *file, uint size);
   ByteVector render(ASF::File *file);
 };
 
-class ASF::File::FilePrivate::CodecListObject : public ASF::File::FilePrivate::BaseObject
-{
-public:
-  ByteVector guid() const;
-  void parse(ASF::File *file, unsigned int size);
-
-private:
-  enum CodecType
-  {
-    Video   = 0x0001,
-    Audio   = 0x0002,
-    Unknown = 0xFFFF
-  };
-};
-
-void ASF::File::FilePrivate::BaseObject::parse(ASF::File *file, unsigned int size)
+void ASF::File::BaseObject::parse(ASF::File *file, unsigned int size)
 {
   data.clear();
-  if(size > 24 && size <= (unsigned int)(file->length()))
+  if (size > 24 && size <= (unsigned int)(file->length()))
     data = file->readBlock(size - 24);
   else
-    data = ByteVector();
+    data = ByteVector::null;
 }
 
-ByteVector ASF::File::FilePrivate::BaseObject::render(ASF::File * /*file*/)
+ByteVector ASF::File::BaseObject::render(ASF::File * /*file*/)
 {
   return guid() + ByteVector::fromLongLong(data.size() + 24, false) + data;
 }
 
-ASF::File::FilePrivate::UnknownObject::UnknownObject(const ByteVector &guid) : myGuid(guid)
+ASF::File::UnknownObject::UnknownObject(const ByteVector &guid) : myGuid(guid)
 {
 }
 
-ByteVector ASF::File::FilePrivate::UnknownObject::guid() const
+ByteVector ASF::File::UnknownObject::guid()
 {
   return myGuid;
 }
 
-ByteVector ASF::File::FilePrivate::FilePropertiesObject::guid() const
+ByteVector ASF::File::FilePropertiesObject::guid()
 {
   return filePropertiesGuid;
 }
 
-void ASF::File::FilePrivate::FilePropertiesObject::parse(ASF::File *file, unsigned int size)
+void ASF::File::FilePropertiesObject::parse(ASF::File *file, uint size)
 {
   BaseObject::parse(file, size);
-  if(data.size() < 64) {
-    debug("ASF::File::FilePrivate::FilePropertiesObject::parse() -- data is too short.");
-    return;
-  }
-
-  const long long duration = data.toLongLong(40, false);
-  const long long preroll  = data.toLongLong(56, false);
-  file->d->properties->setLengthInMilliseconds(static_cast<int>(duration / 10000.0 - preroll + 0.5));
+  file->d->properties->setLength((int)(data.mid(40, 8).toLongLong(false) / 10000000L - data.mid(56, 8).toLongLong(false) / 1000L));
 }
 
-ByteVector ASF::File::FilePrivate::StreamPropertiesObject::guid() const
+ByteVector ASF::File::StreamPropertiesObject::guid()
 {
   return streamPropertiesGuid;
 }
 
-void ASF::File::FilePrivate::StreamPropertiesObject::parse(ASF::File *file, unsigned int size)
+void ASF::File::StreamPropertiesObject::parse(ASF::File *file, uint size)
 {
   BaseObject::parse(file, size);
-  if(data.size() < 70) {
-    debug("ASF::File::FilePrivate::StreamPropertiesObject::parse() -- data is too short.");
-    return;
-  }
-
-  file->d->properties->setCodec(data.toUShort(54, false));
-  file->d->properties->setChannels(data.toUShort(56, false));
-  file->d->properties->setSampleRate(data.toUInt(58, false));
-  file->d->properties->setBitrate(static_cast<int>(data.toUInt(62, false) * 8.0 / 1000.0 + 0.5));
-  file->d->properties->setBitsPerSample(data.toUShort(68, false));
+  file->d->properties->setChannels(data.mid(56, 2).toShort(false));
+  file->d->properties->setSampleRate(data.mid(58, 4).toUInt(false));
+  file->d->properties->setBitrate(data.mid(62, 4).toUInt(false) * 8 / 1000);
 }
 
-ByteVector ASF::File::FilePrivate::ContentDescriptionObject::guid() const
+ByteVector ASF::File::ContentDescriptionObject::guid()
 {
   return contentDescriptionGuid;
 }
 
-void ASF::File::FilePrivate::ContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/)
+void ASF::File::ContentDescriptionObject::parse(ASF::File *file, uint /*size*/)
 {
   file->d->contentDescriptionObject = this;
-  const int titleLength     = readWORD(file);
-  const int artistLength    = readWORD(file);
-  const int copyrightLength = readWORD(file);
-  const int commentLength   = readWORD(file);
-  const int ratingLength    = readWORD(file);
-  file->d->tag->setTitle(readString(file,titleLength));
-  file->d->tag->setArtist(readString(file,artistLength));
-  file->d->tag->setCopyright(readString(file,copyrightLength));
-  file->d->tag->setComment(readString(file,commentLength));
-  file->d->tag->setRating(readString(file,ratingLength));
+  int titleLength = file->readWORD();
+  int artistLength = file->readWORD();
+  int copyrightLength = file->readWORD();
+  int commentLength = file->readWORD();
+  int ratingLength = file->readWORD();
+  file->d->tag->setTitle(file->readString(titleLength));
+  file->d->tag->setArtist(file->readString(artistLength));
+  file->d->tag->setCopyright(file->readString(copyrightLength));
+  file->d->tag->setComment(file->readString(commentLength));
+  file->d->tag->setRating(file->readString(ratingLength));
 }
 
-ByteVector ASF::File::FilePrivate::ContentDescriptionObject::render(ASF::File *file)
+ByteVector ASF::File::ContentDescriptionObject::render(ASF::File *file)
 {
-  const ByteVector v1 = renderString(file->d->tag->title());
-  const ByteVector v2 = renderString(file->d->tag->artist());
-  const ByteVector v3 = renderString(file->d->tag->copyright());
-  const ByteVector v4 = renderString(file->d->tag->comment());
-  const ByteVector v5 = renderString(file->d->tag->rating());
+  ByteVector v1 = file->renderString(file->d->tag->title());
+  ByteVector v2 = file->renderString(file->d->tag->artist());
+  ByteVector v3 = file->renderString(file->d->tag->copyright());
+  ByteVector v4 = file->renderString(file->d->tag->comment());
+  ByteVector v5 = file->renderString(file->d->tag->rating());
   data.clear();
   data.append(ByteVector::fromShort(v1.size(), false));
   data.append(ByteVector::fromShort(v2.size(), false));
@@ -292,15 +235,15 @@ ByteVector ASF::File::FilePrivate::ContentDescriptionObject::render(ASF::File *f
   return BaseObject::render(file);
 }
 
-ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::guid() const
+ByteVector ASF::File::ExtendedContentDescriptionObject::guid()
 {
   return extendedContentDescriptionGuid;
 }
 
-void ASF::File::FilePrivate::ExtendedContentDescriptionObject::parse(ASF::File *file, unsigned int /*size*/)
+void ASF::File::ExtendedContentDescriptionObject::parse(ASF::File *file, uint /*size*/)
 {
   file->d->extendedContentDescriptionObject = this;
-  int count = readWORD(file);
+  int count = file->readWORD();
   while(count--) {
     ASF::Attribute attribute;
     String name = attribute.parse(*file);
@@ -308,23 +251,23 @@ void ASF::File::FilePrivate::ExtendedContentDescriptionObject::parse(ASF::File *
   }
 }
 
-ByteVector ASF::File::FilePrivate::ExtendedContentDescriptionObject::render(ASF::File *file)
+ByteVector ASF::File::ExtendedContentDescriptionObject::render(ASF::File *file)
 {
   data.clear();
   data.append(ByteVector::fromShort(attributeData.size(), false));
-  data.append(attributeData.toByteVector(""));
+  data.append(attributeData.toByteVector(ByteVector::null));
   return BaseObject::render(file);
 }
 
-ByteVector ASF::File::FilePrivate::MetadataObject::guid() const
+ByteVector ASF::File::MetadataObject::guid()
 {
   return metadataGuid;
 }
 
-void ASF::File::FilePrivate::MetadataObject::parse(ASF::File *file, unsigned int /*size*/)
+void ASF::File::MetadataObject::parse(ASF::File *file, uint /*size*/)
 {
   file->d->metadataObject = this;
-  int count = readWORD(file);
+  int count = file->readWORD();
   while(count--) {
     ASF::Attribute attribute;
     String name = attribute.parse(*file, 1);
@@ -332,23 +275,23 @@ void ASF::File::FilePrivate::MetadataObject::parse(ASF::File *file, unsigned int
   }
 }
 
-ByteVector ASF::File::FilePrivate::MetadataObject::render(ASF::File *file)
+ByteVector ASF::File::MetadataObject::render(ASF::File *file)
 {
   data.clear();
   data.append(ByteVector::fromShort(attributeData.size(), false));
-  data.append(attributeData.toByteVector(""));
+  data.append(attributeData.toByteVector(ByteVector::null));
   return BaseObject::render(file);
 }
 
-ByteVector ASF::File::FilePrivate::MetadataLibraryObject::guid() const
+ByteVector ASF::File::MetadataLibraryObject::guid()
 {
   return metadataLibraryGuid;
 }
 
-void ASF::File::FilePrivate::MetadataLibraryObject::parse(ASF::File *file, unsigned int /*size*/)
+void ASF::File::MetadataLibraryObject::parse(ASF::File *file, uint /*size*/)
 {
   file->d->metadataLibraryObject = this;
-  int count = readWORD(file);
+  int count = file->readWORD();
   while(count--) {
     ASF::Attribute attribute;
     String name = attribute.parse(*file, 2);
@@ -356,29 +299,24 @@ void ASF::File::FilePrivate::MetadataLibraryObject::parse(ASF::File *file, unsig
   }
 }
 
-ByteVector ASF::File::FilePrivate::MetadataLibraryObject::render(ASF::File *file)
+ByteVector ASF::File::MetadataLibraryObject::render(ASF::File *file)
 {
   data.clear();
   data.append(ByteVector::fromShort(attributeData.size(), false));
-  data.append(attributeData.toByteVector(""));
+  data.append(attributeData.toByteVector(ByteVector::null));
   return BaseObject::render(file);
 }
 
-ASF::File::FilePrivate::HeaderExtensionObject::HeaderExtensionObject()
-{
-  objects.setAutoDelete(true);
-}
-
-ByteVector ASF::File::FilePrivate::HeaderExtensionObject::guid() const
+ByteVector ASF::File::HeaderExtensionObject::guid()
 {
   return headerExtensionGuid;
 }
 
-void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsigned int /*size*/)
+void ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/)
 {
   file->d->headerExtensionObject = this;
   file->seek(18, File::Current);
-  long long dataSize = readDWORD(file);
+  long long dataSize = file->readDWORD();
   long long dataPos = 0;
   while(dataPos < dataSize) {
     ByteVector guid = file->readBlock(16);
@@ -387,7 +325,7 @@ void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsig
       break;
     }
     bool ok;
-    long long size = readQWORD(file, &ok);
+    long long size = file->readQWORD(&ok);
     if(!ok) {
       file->setValid(false);
       break;
@@ -402,99 +340,51 @@ void ASF::File::FilePrivate::HeaderExtensionObject::parse(ASF::File *file, unsig
     else {
       obj = new UnknownObject(guid);
     }
-    obj->parse(file, (unsigned int)size);
+    obj->parse(file, size);
     objects.append(obj);
     dataPos += size;
   }
 }
 
-ByteVector ASF::File::FilePrivate::HeaderExtensionObject::render(ASF::File *file)
+ByteVector ASF::File::HeaderExtensionObject::render(ASF::File *file)
 {
   data.clear();
-  for(List<BaseObject *>::ConstIterator it = objects.begin(); it != objects.end(); ++it) {
-    data.append((*it)->render(file));
+  for(unsigned int i = 0; i < objects.size(); i++) {
+    data.append(objects[i]->render(file));
   }
   data = ByteVector("\x11\xD2\xD3\xAB\xBA\xA9\xcf\x11\x8E\xE6\x00\xC0\x0C\x20\x53\x65\x06\x00", 18) + ByteVector::fromUInt(data.size(), false) + data;
   return BaseObject::render(file);
 }
 
-ByteVector ASF::File::FilePrivate::CodecListObject::guid() const
-{
-  return codecListGuid;
-}
-
-void ASF::File::FilePrivate::CodecListObject::parse(ASF::File *file, unsigned int size)
-{
-  BaseObject::parse(file, size);
-  if(data.size() <= 20) {
-    debug("ASF::File::FilePrivate::CodecListObject::parse() -- data is too short.");
-    return;
-  }
-
-  unsigned int pos = 16;
-
-  const int count = data.toUInt(pos, false);
-  pos += 4;
-
-  for(int i = 0; i < count; ++i) {
-
-    if(pos >= data.size())
-      break;
-
-    const CodecType type = static_cast<CodecType>(data.toUShort(pos, false));
-    pos += 2;
-
-    int nameLength = data.toUShort(pos, false);
-    pos += 2;
-
-    const unsigned int namePos = pos;
-    pos += nameLength * 2;
-
-    const int descLength = data.toUShort(pos, false);
-    pos += 2;
-
-    const unsigned int descPos = pos;
-    pos += descLength * 2;
-
-    const int infoLength = data.toUShort(pos, false);
-    pos += 2 + infoLength * 2;
-
-    if(type == CodecListObject::Audio) {
-      // First audio codec found.
-
-      const String name(data.mid(namePos, nameLength * 2), String::UTF16LE);
-      file->d->properties->setCodecName(name.stripWhiteSpace());
-
-      const String desc(data.mid(descPos, descLength * 2), String::UTF16LE);
-      file->d->properties->setCodecDescription(desc.stripWhiteSpace());
-
-      break;
-    }
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::File::File(FileName file, bool, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
+ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) 
+  : TagLib::File(file)
 {
-  if(isOpen())
-    read();
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
-ASF::File::File(IOStream *stream, bool, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate())
+ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) 
+  : TagLib::File(stream)
 {
-  if(isOpen())
-    read();
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
 ASF::File::~File()
 {
+  for(unsigned int i = 0; i < d->objects.size(); i++) {
+    delete d->objects[i];
+  }
+  if(d->tag) {
+    delete d->tag;
+  }
+  if(d->properties) {
+    delete d->properties;
+  }
   delete d;
 }
 
@@ -503,115 +393,12 @@ ASF::Tag *ASF::File::tag() const
   return d->tag;
 }
 
-PropertyMap ASF::File::properties() const
-{
-  return d->tag->properties();
-}
-
-void ASF::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag->removeUnsupportedProperties(properties);
-}
-
-PropertyMap ASF::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag->setProperties(properties);
-}
-
 ASF::Properties *ASF::File::audioProperties() const
 {
   return d->properties;
 }
 
-bool ASF::File::save()
-{
-  if(readOnly()) {
-    debug("ASF::File::save() -- File is read only.");
-    return false;
-  }
-
-  if(!isValid()) {
-    debug("ASF::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
-  if(!d->contentDescriptionObject) {
-    d->contentDescriptionObject = new FilePrivate::ContentDescriptionObject();
-    d->objects.append(d->contentDescriptionObject);
-  }
-  if(!d->extendedContentDescriptionObject) {
-    d->extendedContentDescriptionObject = new FilePrivate::ExtendedContentDescriptionObject();
-    d->objects.append(d->extendedContentDescriptionObject);
-  }
-  if(!d->headerExtensionObject) {
-    d->headerExtensionObject = new FilePrivate::HeaderExtensionObject();
-    d->objects.append(d->headerExtensionObject);
-  }
-  if(!d->metadataObject) {
-    d->metadataObject = new FilePrivate::MetadataObject();
-    d->headerExtensionObject->objects.append(d->metadataObject);
-  }
-  if(!d->metadataLibraryObject) {
-    d->metadataLibraryObject = new FilePrivate::MetadataLibraryObject();
-    d->headerExtensionObject->objects.append(d->metadataLibraryObject);
-  }
-
-  d->extendedContentDescriptionObject->attributeData.clear();
-  d->metadataObject->attributeData.clear();
-  d->metadataLibraryObject->attributeData.clear();
-
-  const AttributeListMap allAttributes = d->tag->attributeListMap();
-
-  for(AttributeListMap::ConstIterator it = allAttributes.begin(); it != allAttributes.end(); ++it) {
-
-    const String &name = it->first;
-    const AttributeList &attributes = it->second;
-
-    bool inExtendedContentDescriptionObject = false;
-    bool inMetadataObject = false;
-
-    for(AttributeList::ConstIterator jt = attributes.begin(); jt != attributes.end(); ++jt) {
-
-      const Attribute &attribute = *jt;
-      const bool largeValue = (attribute.dataSize() > 65535);
-      const bool guid       = (attribute.type() == Attribute::GuidType);
-
-      if(!inExtendedContentDescriptionObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() == 0) {
-        d->extendedContentDescriptionObject->attributeData.append(attribute.render(name));
-        inExtendedContentDescriptionObject = true;
-      }
-      else if(!inMetadataObject && !guid && !largeValue && attribute.language() == 0 && attribute.stream() != 0) {
-        d->metadataObject->attributeData.append(attribute.render(name, 1));
-        inMetadataObject = true;
-      }
-      else {
-        d->metadataLibraryObject->attributeData.append(attribute.render(name, 2));
-      }
-    }
-  }
-
-  ByteVector data;
-  for(List<FilePrivate::BaseObject *>::ConstIterator it = d->objects.begin(); it != d->objects.end(); ++it) {
-    data.append((*it)->render(this));
-  }
-
-  seek(16);
-  writeBlock(ByteVector::fromLongLong(data.size() + 30, false));
-  writeBlock(ByteVector::fromUInt(d->objects.size(), false));
-  writeBlock(ByteVector("\x01\x02", 2));
-
-  insert(data, 30, static_cast<unsigned long>(d->headerSize - 30));
-
-  d->headerSize = data.size() + 30;
-
-  return true;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void ASF::File::read()
+void ASF::File::read(bool /*readProperties*/, Properties::ReadStyle /*propertiesStyle*/)
 {
   if(!isValid())
     return;
@@ -627,12 +414,12 @@ void ASF::File::read()
   d->properties = new ASF::Properties();
 
   bool ok;
-  d->headerSize = readQWORD(this, &ok);
+  d->size = readQWORD(&ok);
   if(!ok) {
     setValid(false);
     return;
   }
-  int numObjects = readDWORD(this, &ok);
+  int numObjects = readDWORD(&ok);
   if(!ok) {
     setValid(false);
     return;
@@ -640,34 +427,31 @@ void ASF::File::read()
   seek(2, Current);
 
   for(int i = 0; i < numObjects; i++) {
-    guid = readBlock(16);
+    ByteVector guid = readBlock(16);
     if(guid.size() != 16) {
       setValid(false);
       break;
     }
-    long size = (long)readQWORD(this, &ok);
+    long size = (long)readQWORD(&ok);
     if(!ok) {
       setValid(false);
       break;
     }
-    FilePrivate::BaseObject *obj;
+    BaseObject *obj;
     if(guid == filePropertiesGuid) {
-      obj = new FilePrivate::FilePropertiesObject();
+      obj = new FilePropertiesObject();
     }
     else if(guid == streamPropertiesGuid) {
-      obj = new FilePrivate::StreamPropertiesObject();
+      obj = new StreamPropertiesObject();
     }
     else if(guid == contentDescriptionGuid) {
-      obj = new FilePrivate::ContentDescriptionObject();
+      obj = new ContentDescriptionObject();
     }
     else if(guid == extendedContentDescriptionGuid) {
-      obj = new FilePrivate::ExtendedContentDescriptionObject();
+      obj = new ExtendedContentDescriptionObject();
     }
     else if(guid == headerExtensionGuid) {
-      obj = new FilePrivate::HeaderExtensionObject();
-    }
-    else if(guid == codecListGuid) {
-      obj = new FilePrivate::CodecListObject();
+      obj = new HeaderExtensionObject();
     }
     else {
       if(guid == contentEncryptionGuid ||
@@ -675,9 +459,149 @@ void ASF::File::read()
          guid == advancedContentEncryptionGuid) {
         d->properties->setEncrypted(true);
       }
-      obj = new FilePrivate::UnknownObject(guid);
+      obj = new UnknownObject(guid);
     }
     obj->parse(this, size);
     d->objects.append(obj);
   }
 }
+
+bool ASF::File::save()
+{
+  if(readOnly()) {
+    debug("ASF::File::save() -- File is read only.");
+    return false;
+  }
+
+  if(!isValid()) {
+    debug("ASF::File::save() -- Trying to save invalid file.");
+    return false;
+  }
+
+  if(!d->contentDescriptionObject) {
+    d->contentDescriptionObject = new ContentDescriptionObject();
+    d->objects.append(d->contentDescriptionObject);
+  }
+  if(!d->extendedContentDescriptionObject) {
+    d->extendedContentDescriptionObject = new ExtendedContentDescriptionObject();
+    d->objects.append(d->extendedContentDescriptionObject);
+  }
+  if(!d->headerExtensionObject) {
+    d->headerExtensionObject = new HeaderExtensionObject();
+    d->objects.append(d->headerExtensionObject);
+  }
+  if(!d->metadataObject) {
+    d->metadataObject = new MetadataObject();
+    d->headerExtensionObject->objects.append(d->metadataObject);
+  }
+  if(!d->metadataLibraryObject) {
+    d->metadataLibraryObject = new MetadataLibraryObject();
+    d->headerExtensionObject->objects.append(d->metadataLibraryObject);
+  }
+
+  ASF::AttributeListMap::ConstIterator it = d->tag->attributeListMap().begin();
+  for(; it != d->tag->attributeListMap().end(); it++) {
+    const String &name = it->first;
+    const AttributeList &attributes = it->second;
+    bool inExtendedContentDescriptionObject = false;
+    bool inMetadataObject = false;
+    for(unsigned int j = 0; j < attributes.size(); j++) {
+      const Attribute &attribute = attributes[j];
+      bool largeValue = attribute.dataSize() > 65535;
+      if(!inExtendedContentDescriptionObject && !largeValue && attribute.language() == 0 && attribute.stream() == 0) {
+        d->extendedContentDescriptionObject->attributeData.append(attribute.render(name));
+        inExtendedContentDescriptionObject = true;
+      }
+      else if(!inMetadataObject && !largeValue && attribute.language() == 0 && attribute.stream() != 0) {
+        d->metadataObject->attributeData.append(attribute.render(name, 1));
+        inMetadataObject = true;
+      }
+      else {
+        d->metadataLibraryObject->attributeData.append(attribute.render(name, 2));
+      }
+    }
+  }
+
+  ByteVector data;
+  for(unsigned int i = 0; i < d->objects.size(); i++) {
+    data.append(d->objects[i]->render(this));
+  }
+  data = headerGuid + ByteVector::fromLongLong(data.size() + 30, false) + ByteVector::fromUInt(d->objects.size(), false) + ByteVector("\x01\x02", 2) + data;
+  insert(data, 0, d->size);
+
+  return true;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+int ASF::File::readBYTE(bool *ok)
+{
+  ByteVector v = readBlock(1);
+  if(v.size() != 1) {
+    if(ok) *ok = false;
+    return 0;
+  }
+  if(ok) *ok = true;
+  return v[0];
+}
+
+int ASF::File::readWORD(bool *ok)
+{
+  ByteVector v = readBlock(2);
+  if(v.size() != 2) {
+    if(ok) *ok = false;
+    return 0;
+  }
+  if(ok) *ok = true;
+  return v.toUShort(false);
+}
+
+unsigned int ASF::File::readDWORD(bool *ok)
+{
+  ByteVector v = readBlock(4);
+  if(v.size() != 4) {
+    if(ok) *ok = false;
+    return 0;
+  }
+  if(ok) *ok = true;
+  return v.toUInt(false);
+}
+
+long long ASF::File::readQWORD(bool *ok)
+{
+  ByteVector v = readBlock(8);
+  if(v.size() != 8) {
+    if(ok) *ok = false;
+    return 0;
+  }
+  if(ok) *ok = true;
+  return v.toLongLong(false);
+}
+
+String ASF::File::readString(int length)
+{
+  ByteVector data = readBlock(length);
+  unsigned int size = data.size();
+  while (size >= 2) {
+    if(data[size - 1] != '\0' || data[size - 2] != '\0') {
+      break;
+    }
+    size -= 2;
+  }
+  if(size != data.size()) {
+    data.resize(size);
+  }
+  return String(data, String::UTF16LE);
+}
+
+ByteVector ASF::File::renderString(const String &str, bool includeLength)
+{
+  ByteVector data = str.data(String::UTF16LE) + ByteVector::fromShort(0, false);
+  if(includeLength) {
+    data = ByteVector::fromShort(data.size(), false) + data;
+  }
+  return data;
+}
+

taglib/asf/asffile.h

@@ -48,27 +48,24 @@ namespace TagLib {
     public:
 
       /*!
-       * Constructs an ASF file from \a file.
+       * 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.  The audio properties are always
-       * read.
+       * \a propertiesStyle are ignored.
        */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+      File(FileName file, bool readProperties = true, Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
-       * Constructs an ASF file from \a stream.
+       * 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.  The audio properties are always
-       * read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
+       * \a propertiesStyle are ignored.
        */
-      File(IOStream *stream, bool readProperties = true,
-           Properties::ReadStyle propertiesStyle = Properties::Average);
+      File(IOStream *stream, bool readProperties = true, Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
        * Destroys this instance of the File.
@@ -87,22 +84,6 @@ namespace TagLib {
        */
       virtual Tag *tag() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       */
-      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.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the ASF audio properties for this file.
        */
@@ -116,7 +97,27 @@ namespace TagLib {
       virtual bool save();
 
     private:
-      void read();
+
+      int readBYTE(bool *ok = 0);
+      int readWORD(bool *ok = 0);
+      unsigned int readDWORD(bool *ok = 0);
+      long long readQWORD(bool *ok = 0);
+      static ByteVector renderString(const String &str, bool includeLength = false);
+      String readString(int len);
+      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+
+      friend class Attribute;
+      friend class Picture;
+
+      class BaseObject;
+      class UnknownObject;
+      class FilePropertiesObject;
+      class StreamPropertiesObject;
+      class ContentDescriptionObject;
+      class ExtendedContentDescriptionObject;
+      class HeaderExtensionObject;
+      class MetadataObject;
+      class MetadataLibraryObject;
 
       class FilePrivate;
       FilePrivate *d;

taglib/asf/asfpicture.cpp

@@ -23,18 +23,19 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
-#include <trefcounter.h>
-
 #include "asfattribute.h"
 #include "asffile.h"
 #include "asfpicture.h"
-#include "asfutils.h"
 
 using namespace TagLib;
 
-class ASF::Picture::PicturePrivate : public RefCounter
+class ASF::Picture::PicturePriavte : public RefCounter
 {
 public:
   bool valid;
@@ -48,14 +49,14 @@ public:
 // Picture class members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::Picture::Picture() :
-  d(new PicturePrivate())
+ASF::Picture::Picture()
 {
+  d = new PicturePriavte();
   d->valid = true;
 }
 
-ASF::Picture::Picture(const Picture& other) :
-  d(other.d)
+ASF::Picture::Picture(const Picture& other)
+  : d(other.d)
 {
   d->ref();
 }
@@ -120,27 +121,24 @@ int ASF::Picture::dataSize() const
 
 ASF::Picture& ASF::Picture::operator=(const ASF::Picture& other)
 {
-  Picture(other).swap(*this);
+  if(other.d != d) {
+    if(d->deref())
+      delete d;
+    d = other.d;
+    d->ref();
+  }
   return *this;
 }
 
-void ASF::Picture::swap(Picture &other)
-{
-  using std::swap;
-
-  swap(d, other.d);
-}
-
 ByteVector ASF::Picture::render() const
 {
   if(!isValid())
-    return ByteVector();
-
+    return ByteVector::null;
   return
     ByteVector((char)d->type) +
     ByteVector::fromUInt(d->picture.size(), false) +
-    renderString(d->mimeType) +
-    renderString(d->description) +
+    ASF::File::renderString(d->mimeType) +
+    ASF::File::renderString(d->description) +
     d->picture;
 }
 
@@ -151,7 +149,7 @@ void ASF::Picture::parse(const ByteVector& bytes)
     return;
   int pos = 0;
   d->type = (Type)bytes[0]; ++pos;
-  const unsigned int dataLen = bytes.toUInt(pos, false); pos+=4;
+  uint dataLen = bytes.mid(pos, 4).toUInt(false); pos+=4;
 
   const ByteVector nullStringTerminator(2, 0);
 
@@ -181,3 +179,4 @@ ASF::Picture ASF::Picture::fromInvalid()
   ret.d->valid = false;
   return ret;
 }
+

taglib/asf/asfpicture.h

@@ -117,11 +117,6 @@ namespace TagLib
        */
       Picture& operator=(const Picture& other);
 
-      /*!
-       * Exchanges the content of the Picture by the content of \a other.
-       */
-      void swap(Picture &other);
-
       /*!
        * Returns true if Picture stores valid picture
        */
@@ -210,11 +205,11 @@ namespace TagLib
       /* THIS IS PRIVATE, DON'T TOUCH IT! */
       void parse(const ByteVector& );
       static Picture fromInvalid();
+      friend class Attribute;
 #endif
-
       private:
-        class PicturePrivate;
-        PicturePrivate *d;
+        struct PicturePriavte;
+        PicturePriavte *d;
       };
   }
 }

taglib/asf/asfproperties.cpp

@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdebug.h>
 #include <tstring.h>
 #include "asfproperties.h"
@@ -32,23 +36,11 @@ using namespace TagLib;
 class ASF::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate() :
-    length(0),
-    bitrate(0),
-    sampleRate(0),
-    channels(0),
-    bitsPerSample(0),
-    codec(ASF::Properties::Unknown),
-    encrypted(false) {}
-
+  PropertiesPrivate(): length(0), bitrate(0), sampleRate(0), channels(0), encrypted(false) {}
   int length;
   int bitrate;
   int sampleRate;
   int channels;
-  int bitsPerSample;
-  ASF::Properties::Codec codec;
-  String codecName;
-  String codecDescription;
   bool encrypted;
 };
 
@@ -56,28 +48,18 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::Properties::Properties() :
-  AudioProperties(AudioProperties::Average),
-  d(new PropertiesPrivate())
+ASF::Properties::Properties() : AudioProperties(AudioProperties::Average)
 {
+  d = new PropertiesPrivate;
 }
 
 ASF::Properties::~Properties()
 {
-  delete d;
+  if(d)
+    delete d;  
 }
 
 int ASF::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int ASF::Properties::lengthInSeconds() const
-{
-  return d->length / 1000;
-}
-
-int ASF::Properties::lengthInMilliseconds() const
 {
   return d->length;
 }
@@ -95,27 +77,7 @@ int ASF::Properties::sampleRate() const
 int ASF::Properties::channels() const
 {
   return d->channels;
-}
-
-int ASF::Properties::bitsPerSample() const
-{
-  return d->bitsPerSample;
-}
-
-ASF::Properties::Codec ASF::Properties::codec() const
-{
-  return d->codec;
-}
-
-String ASF::Properties::codecName() const
-{
-  return d->codecName;
-}
-
-String ASF::Properties::codecDescription() const
-{
-  return d->codecDescription;
-}
+} 
 
 bool ASF::Properties::isEncrypted() const
 {
@@ -126,69 +88,28 @@ bool ASF::Properties::isEncrypted() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void ASF::Properties::setLength(int /*length*/)
+void ASF::Properties::setLength(int length)
 {
-  debug("ASF::Properties::setLength() -- This method is deprecated. Do not use.");
+  d->length = length;
 }
 
-void ASF::Properties::setLengthInMilliseconds(int value)
+void ASF::Properties::setBitrate(int length)
 {
-  d->length = value;
+  d->bitrate = length;
 }
 
-void ASF::Properties::setBitrate(int value)
+void ASF::Properties::setSampleRate(int length)
 {
-  d->bitrate = value;
+  d->sampleRate = length;
 }
 
-void ASF::Properties::setSampleRate(int value)
+void ASF::Properties::setChannels(int length)
 {
-  d->sampleRate = value;
+  d->channels = length;
 }
 
-void ASF::Properties::setChannels(int value)
+void ASF::Properties::setEncrypted(bool encrypted)
 {
-  d->channels = value;
+  d->encrypted = encrypted;
 }
 
-void ASF::Properties::setBitsPerSample(int value)
-{
-  d->bitsPerSample = value;
-}
-
-void ASF::Properties::setCodec(int value)
-{
-  switch(value)
-  {
-  case 0x0160:
-    d->codec = WMA1;
-    break;
-  case 0x0161:
-    d->codec = WMA2;
-    break;
-  case 0x0162:
-    d->codec = WMA9Pro;
-    break;
-  case 0x0163:
-    d->codec = WMA9Lossless;
-    break;
-  default:
-    d->codec = Unknown;
-    break;
-  }
-}
-
-void ASF::Properties::setCodecName(const String &value)
-{
-  d->codecName = value;
-}
-
-void ASF::Properties::setCodecDescription(const String &value)
-{
-  d->codecDescription = value;
-}
-
-void ASF::Properties::setEncrypted(bool value)
-{
-  d->encrypted = value;
-}

taglib/asf/asfproperties.h

@@ -40,38 +40,7 @@ namespace TagLib {
     public:
 
       /*!
-       * Audio codec types can be used in ASF file.
-       */
-      enum Codec
-      {
-        /*!
-         * Couldn't detect the codec.
-         */
-        Unknown = 0,
-
-        /*!
-         * Windows Media Audio 1
-         */
-        WMA1,
-
-        /*!
-         * Windows Media Audio 2 or above
-         */
-        WMA2,
-
-        /*!
-         * Windows Media Audio 9 Professional
-         */
-        WMA9Pro,
-
-        /*!
-         * Windows Media Audio 9 Lossless
-         */
-        WMA9Lossless,
-      };
-
-      /*!
-       * Creates an instance of ASF::Properties.
+       * Create an instance of ASF::Properties.
        */
       Properties();
 
@@ -80,97 +49,18 @@ namespace TagLib {
        */
       virtual ~Properties();
 
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
+      // Reimplementations.
       virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \see lengthInMilliseconds()
-       */
-      // BIC: make virtual
-      int lengthInSeconds() const;
-
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
-
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
       virtual int bitrate() const;
-
-      /*!
-       * Returns the sample rate in Hz.
-       */
       virtual int sampleRate() const;
-
-      /*!
-       * Returns the number of audio channels.
-       */
       virtual int channels() const;
-
-      /*!
-       * Returns the number of bits per audio sample.
-       */
-      int bitsPerSample() const;
-
-      /*!
-       * Returns the codec used in the file.
-       *
-       * \see codecName()
-       * \see codecDescription()
-       */
-      Codec codec() const;
-
-      /*!
-       * Returns the concrete codec name, for example "Windows Media Audio 9.1"
-       * used in the file if available, otherwise an empty string.
-       *
-       * \see codec()
-       * \see codecDescription()
-       */
-      String codecName() const;
-
-      /*!
-       * Returns the codec description, typically contains the encoder settings,
-       * for example "VBR Quality 50, 44kHz, stereo 1-pass VBR" if available,
-       * otherwise an empty string.
-       *
-       * \see codec()
-       * \see codecName()
-       */
-      String codecDescription() const;
-
-      /*!
-       * Returns whether or not the file is encrypted.
-       */
       bool isEncrypted() const;
 
 #ifndef DO_NOT_DOCUMENT
-      // deprecated
       void setLength(int value);
-
-      void setLengthInMilliseconds(int value);
       void setBitrate(int value);
       void setSampleRate(int value);
       void setChannels(int value);
-      void setBitsPerSample(int value);
-      void setCodec(int value);
-      void setCodecName(const String &value);
-      void setCodecDescription(const String &value);
       void setEncrypted(bool value);
 #endif
 
@@ -183,4 +73,4 @@ namespace TagLib {
 
 }
 
-#endif
+#endif 

taglib/asf/asftag.cpp

@@ -23,7 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tpropertymap.h>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include "asftag.h"
 
 using namespace TagLib;
@@ -47,7 +50,8 @@ ASF::Tag::Tag()
 
 ASF::Tag::~Tag()
 {
-  delete d;
+  if(d)
+    delete d;
 }
 
 String ASF::Tag::title() const
@@ -64,7 +68,7 @@ String ASF::Tag::album() const
 {
   if(d->attributeListMap.contains("WM/AlbumTitle"))
     return d->attributeListMap["WM/AlbumTitle"][0].toString();
-  return String();
+  return String::null;
 }
 
 String ASF::Tag::copyright() const
@@ -107,7 +111,7 @@ String ASF::Tag::genre() const
 {
   if(d->attributeListMap.contains("WM/Genre"))
     return d->attributeListMap["WM/Genre"][0].toString();
-  return String();
+  return String::null;
 }
 
 void ASF::Tag::setTitle(const String &value)
@@ -145,12 +149,12 @@ void ASF::Tag::setGenre(const String &value)
   setAttribute("WM/Genre", value);
 }
 
-void ASF::Tag::setYear(unsigned int value)
+void ASF::Tag::setYear(uint value)
 {
   setAttribute("WM/Year", String::number(value));
 }
 
-void ASF::Tag::setTrack(unsigned int value)
+void ASF::Tag::setTrack(uint value)
 {
   setAttribute("WM/TrackNumber", String::number(value));
 }
@@ -160,24 +164,11 @@ ASF::AttributeListMap& ASF::Tag::attributeListMap()
   return d->attributeListMap;
 }
 
-const ASF::AttributeListMap &ASF::Tag::attributeListMap() const
-{
-  return d->attributeListMap;
-}
-
-bool ASF::Tag::contains(const String &key) const
-{
-  return d->attributeListMap.contains(key);
-}
-
 void ASF::Tag::removeItem(const String &key)
 {
-  d->attributeListMap.erase(key);
-}
-
-ASF::AttributeList ASF::Tag::attribute(const String &name) const
-{
-  return d->attributeListMap[name];
+  AttributeListMap::Iterator it = d->attributeListMap.find(key);
+  if(it != d->attributeListMap.end())
+    d->attributeListMap.erase(it);
 }
 
 void ASF::Tag::setAttribute(const String &name, const Attribute &attribute)
@@ -187,11 +178,6 @@ void ASF::Tag::setAttribute(const String &name, const Attribute &attribute)
   d->attributeListMap.insert(name, value);
 }
 
-void ASF::Tag::setAttribute(const String &name, const AttributeList &values)
-{
-  d->attributeListMap.insert(name, values);
-}
-
 void ASF::Tag::addAttribute(const String &name, const Attribute &attribute)
 {
   if(d->attributeListMap.contains(name)) {
@@ -210,169 +196,3 @@ bool ASF::Tag::isEmpty() const
          d->attributeListMap.isEmpty();
 }
 
-namespace
-{
-  const char *keyTranslation[][2] = {
-    { "WM/AlbumTitle", "ALBUM" },
-    { "WM/AlbumArtist", "ALBUMARTIST" },
-    { "WM/Composer", "COMPOSER" },
-    { "WM/Writer", "WRITER" },
-    { "WM/Conductor", "CONDUCTOR" },
-    { "WM/ModifiedBy", "REMIXER" },
-    { "WM/Year", "DATE" },
-    { "WM/OriginalReleaseYear", "ORIGINALDATE" },
-    { "WM/Producer", "PRODUCER" },
-    { "WM/ContentGroupDescription", "GROUPING" },
-    { "WM/SubTitle", "SUBTITLE" },
-    { "WM/SetSubTitle", "DISCSUBTITLE" },
-    { "WM/TrackNumber", "TRACKNUMBER" },
-    { "WM/PartOfSet", "DISCNUMBER" },
-    { "WM/Genre", "GENRE" },
-    { "WM/BeatsPerMinute", "BPM" },
-    { "WM/Mood", "MOOD" },
-    { "WM/ISRC", "ISRC" },
-    { "WM/Lyrics", "LYRICS" },
-    { "WM/Media", "MEDIA" },
-    { "WM/Publisher", "LABEL" },
-    { "WM/CatalogNo", "CATALOGNUMBER" },
-    { "WM/Barcode", "BARCODE" },
-    { "WM/EncodedBy", "ENCODEDBY" },
-    { "WM/AlbumSortOrder", "ALBUMSORT" },
-    { "WM/AlbumArtistSortOrder", "ALBUMARTISTSORT" },
-    { "WM/ArtistSortOrder", "ARTISTSORT" },
-    { "WM/TitleSortOrder", "TITLESORT" },
-    { "WM/Script", "SCRIPT" },
-    { "WM/Language", "LANGUAGE" },
-    { "MusicBrainz/Track Id", "MUSICBRAINZ_TRACKID" },
-    { "MusicBrainz/Artist Id", "MUSICBRAINZ_ARTISTID" },
-    { "MusicBrainz/Album Id", "MUSICBRAINZ_ALBUMID" },
-    { "MusicBrainz/Album Artist Id", "MUSICBRAINZ_ALBUMARTISTID" },
-    { "MusicBrainz/Release Group Id", "MUSICBRAINZ_RELEASEGROUPID" },
-    { "MusicBrainz/Work Id", "MUSICBRAINZ_WORKID" },
-    { "MusicIP/PUID", "MUSICIP_PUID" },
-    { "Acoustid/Id", "ACOUSTID_ID" },
-    { "Acoustid/Fingerprint", "ACOUSTID_FINGERPRINT" },
-  };
-  const size_t keyTranslationSize = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-
-  String translateKey(const String &key)
-  {
-    for(size_t i = 0; i < keyTranslationSize; ++i) {
-      if(key == keyTranslation[i][0])
-        return keyTranslation[i][1];
-    }
-
-    return String();
-  }
-}
-
-PropertyMap ASF::Tag::properties() const
-{
-  PropertyMap props;
-
-  if(!d->title.isEmpty()) {
-    props["TITLE"] = d->title;
-  }
-  if(!d->artist.isEmpty()) {
-    props["ARTIST"] = d->artist;
-  }
-  if(!d->copyright.isEmpty()) {
-    props["COPYRIGHT"] = d->copyright;
-  }
-  if(!d->comment.isEmpty()) {
-    props["COMMENT"] = d->comment;
-  }
-
-  ASF::AttributeListMap::ConstIterator it = d->attributeListMap.begin();
-  for(; it != d->attributeListMap.end(); ++it) {
-    const String key = translateKey(it->first);
-    if(!key.isEmpty()) {
-      AttributeList::ConstIterator it2 = it->second.begin();
-      for(; it2 != it->second.end(); ++it2) {
-        if(key == "TRACKNUMBER") {
-          if(it2->type() == ASF::Attribute::DWordType)
-            props.insert(key, String::number(it2->toUInt()));
-          else
-            props.insert(key, it2->toString());
-        }
-        else {
-          props.insert(key, it2->toString());
-        }
-      }
-    }
-    else {
-      props.unsupportedData().append(it->first);
-    }
-  }
-  return props;
-}
-
-void ASF::Tag::removeUnsupportedProperties(const StringList &props)
-{
-  StringList::ConstIterator it = props.begin();
-  for(; it != props.end(); ++it)
-    d->attributeListMap.erase(*it);
-}
-
-PropertyMap ASF::Tag::setProperties(const PropertyMap &props)
-{
-  static Map<String, String> reverseKeyMap;
-  if(reverseKeyMap.isEmpty()) {
-    int numKeys = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-    for(int i = 0; i < numKeys; i++) {
-      reverseKeyMap[keyTranslation[i][1]] = keyTranslation[i][0];
-    }
-  }
-
-  PropertyMap origProps = properties();
-  PropertyMap::ConstIterator it = origProps.begin();
-  for(; it != origProps.end(); ++it) {
-    if(!props.contains(it->first) || props[it->first].isEmpty()) {
-      if(it->first == "TITLE") {
-        d->title.clear();
-      }
-      else if(it->first == "ARTIST") {
-        d->artist.clear();
-      }
-      else if(it->first == "COMMENT") {
-        d->comment.clear();
-      }
-      else if(it->first == "COPYRIGHT") {
-        d->copyright.clear();
-      }
-      else {
-        d->attributeListMap.erase(reverseKeyMap[it->first]);
-      }
-    }
-  }
-
-  PropertyMap ignoredProps;
-  it = props.begin();
-  for(; it != props.end(); ++it) {
-    if(reverseKeyMap.contains(it->first)) {
-      String name = reverseKeyMap[it->first];
-      removeItem(name);
-      StringList::ConstIterator it2 = it->second.begin();
-      for(; it2 != it->second.end(); ++it2) {
-        addAttribute(name, *it2);
-      }
-    }
-    else if(it->first == "TITLE") {
-      d->title = it->second.toString();
-    }
-    else if(it->first == "ARTIST") {
-      d->artist = it->second.toString();
-    }
-    else if(it->first == "COMMENT") {
-      d->comment = it->second.toString();
-    }
-    else if(it->first == "COPYRIGHT") {
-      d->copyright = it->second.toString();
-    }
-    else {
-      ignoredProps.insert(it->first, it->second);
-    }
-  }
-
-  return ignoredProps;
-}

taglib/asf/asftag.h

@@ -90,13 +90,13 @@ namespace TagLib {
       /*!
        * Returns the year; if there is no year set, this will return 0.
        */
-      virtual unsigned int year() const;
+      virtual uint year() const;
 
       /*!
        * Returns the track number; if there is no track number set, this will
        * return 0.
        */
-      virtual unsigned int track() const;
+      virtual uint track() const;
 
       /*!
        * Sets the title to \a s.
@@ -120,29 +120,29 @@ namespace TagLib {
       virtual void setComment(const String &s);
 
       /*!
-       * Sets the rating to \a s.
+       * Sets the rating to \a s. 
        */
       virtual void setRating(const String &s);
 
       /*!
-       * Sets the copyright to \a s.
+       * Sets the copyright to \a s. 
        */
       virtual void setCopyright(const String &s);
 
       /*!
-       * Sets the genre to \a s.
+       * Sets the genre to \a s. 
        */
       virtual void setGenre(const String &s);
 
       /*!
        * Sets the year to \a i.  If \a s is 0 then this value will be cleared.
        */
-      virtual void setYear(unsigned int i);
+      virtual void setYear(uint i);
 
       /*!
        * Sets the track to \a i.  If \a s is 0 then this value will be cleared.
        */
-      virtual void setTrack(unsigned int i);
+      virtual void setTrack(uint i);
 
       /*!
        * Returns true if the tag does not contain any data.  This should be
@@ -151,54 +151,31 @@ namespace TagLib {
        */
       virtual bool isEmpty() const;
 
-      /*!
-       * \deprecated
-       */
-      AttributeListMap &attributeListMap();
-
       /*!
        * Returns a reference to the item list map.  This is an AttributeListMap of
        * all of the items in the tag.
+       *
+       * This is the most powerfull structure for accessing the items of the tag.
        */
-      const AttributeListMap &attributeListMap() const;
-
-      /*!
-       * \return True if a value for \a attribute is currently set.
-       */
-      bool contains(const String &name) const;
+      AttributeListMap &attributeListMap();
 
       /*!
        * Removes the \a key attribute from the tag
        */
       void removeItem(const String &name);
 
-      /*!
-       * \return The list of values for the key \a name, or an empty list if no
-       * values have been set.
-       */
-      AttributeList attribute(const String &name) const;
-
       /*!
        * Sets the \a key attribute to the value of \a attribute. If an attribute
        * with the \a key is already present, it will be replaced.
        */
       void setAttribute(const String &name, const Attribute &attribute);
 
-      /*!
-       * Sets multiple \a values to the key \a name.
-       */
-      void setAttribute(const String &name, const AttributeList &values);
-
       /*!
        * Sets the \a key attribute to the value of \a attribute. If an attribute
        * with the \a key is already present, it will be added to the list.
        */
       void addAttribute(const String &name, const Attribute &attribute);
 
-      PropertyMap properties() const;
-      void removeUnsupportedProperties(const StringList& properties);
-      PropertyMap setProperties(const PropertyMap &properties);
-
     private:
 
       class TagPrivate;

taglib/asf/asfutils.h

@@ -1,104 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2015 by Tsuda Kageyu
-    email                : tsuda.kageyu@gmail.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_ASFUTILS_H
-#define TAGLIB_ASFUTILS_H
-
-// THIS FILE IS NOT A PART OF THE TAGLIB API
-
-#ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
-
-namespace TagLib
-{
-  namespace ASF
-  {
-    namespace
-    {
-
-      inline unsigned short readWORD(File *file, bool *ok = 0)
-      {
-        const ByteVector v = file->readBlock(2);
-        if(v.size() != 2) {
-          if(ok) *ok = false;
-          return 0;
-        }
-        if(ok) *ok = true;
-        return v.toUShort(false);
-      }
-
-      inline unsigned int readDWORD(File *file, bool *ok = 0)
-      {
-        const ByteVector v = file->readBlock(4);
-        if(v.size() != 4) {
-          if(ok) *ok = false;
-          return 0;
-        }
-        if(ok) *ok = true;
-        return v.toUInt(false);
-      }
-
-      inline long long readQWORD(File *file, bool *ok = 0)
-      {
-        const ByteVector v = file->readBlock(8);
-        if(v.size() != 8) {
-          if(ok) *ok = false;
-          return 0;
-        }
-        if(ok) *ok = true;
-        return v.toLongLong(false);
-      }
-
-      inline String readString(File *file, int length)
-      {
-        ByteVector data = file->readBlock(length);
-        unsigned int size = data.size();
-        while (size >= 2) {
-          if(data[size - 1] != '\0' || data[size - 2] != '\0') {
-            break;
-          }
-          size -= 2;
-        }
-        if(size != data.size()) {
-          data.resize(size);
-        }
-        return String(data, String::UTF16LE);
-      }
-
-      inline ByteVector renderString(const String &str, bool includeLength = false)
-      {
-        ByteVector data = str.data(String::UTF16LE) + ByteVector::fromShort(0, false);
-        if(includeLength) {
-          data = ByteVector::fromShort(data.size(), false) + data;
-        }
-        return data;
-      }
-
-    }
-  }
-}
-
-#endif
-
-#endif

taglib/audioproperties.cpp

@@ -23,22 +23,6 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <tbytevector.h>
-
-#include "aiffproperties.h"
-#include "apeproperties.h"
-#include "asfproperties.h"
-#include "flacproperties.h"
-#include "mp4properties.h"
-#include "mpcproperties.h"
-#include "mpegproperties.h"
-#include "opusproperties.h"
-#include "speexproperties.h"
-#include "trueaudioproperties.h"
-#include "vorbisproperties.h"
-#include "wavproperties.h"
-#include "wavpackproperties.h"
-
 #include "audioproperties.h"
 
 using namespace TagLib;
@@ -57,108 +41,11 @@ AudioProperties::~AudioProperties()
 
 }
 
-int AudioProperties::lengthInSeconds() const
-{
-  // This is an ugly workaround but we can't add a virtual function.
-  // Should be virtual in taglib2.
-
-  if(dynamic_cast<const APE::Properties*>(this))
-    return dynamic_cast<const APE::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const ASF::Properties*>(this))
-    return dynamic_cast<const ASF::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const FLAC::Properties*>(this))
-    return dynamic_cast<const FLAC::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const MP4::Properties*>(this))
-    return dynamic_cast<const MP4::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const MPC::Properties*>(this))
-    return dynamic_cast<const MPC::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const MPEG::Properties*>(this))
-    return dynamic_cast<const MPEG::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const Ogg::Opus::Properties*>(this))
-    return dynamic_cast<const Ogg::Opus::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const Ogg::Speex::Properties*>(this))
-    return dynamic_cast<const Ogg::Speex::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const TrueAudio::Properties*>(this))
-    return dynamic_cast<const TrueAudio::Properties*>(this)->lengthInSeconds();
-
-  else if (dynamic_cast<const RIFF::AIFF::Properties*>(this))
-    return dynamic_cast<const RIFF::AIFF::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const RIFF::WAV::Properties*>(this))
-    return dynamic_cast<const RIFF::WAV::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const Vorbis::Properties*>(this))
-    return dynamic_cast<const Vorbis::Properties*>(this)->lengthInSeconds();
-
-  else if(dynamic_cast<const WavPack::Properties*>(this))
-    return dynamic_cast<const WavPack::Properties*>(this)->lengthInSeconds();
-
-  else
-    return 0;
-}
-
-int AudioProperties::lengthInMilliseconds() const
-{
-  // This is an ugly workaround but we can't add a virtual function.
-  // Should be virtual in taglib2.
-
-  if(dynamic_cast<const APE::Properties*>(this))
-    return dynamic_cast<const APE::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const ASF::Properties*>(this))
-    return dynamic_cast<const ASF::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const FLAC::Properties*>(this))
-    return dynamic_cast<const FLAC::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const MP4::Properties*>(this))
-    return dynamic_cast<const MP4::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const MPC::Properties*>(this))
-    return dynamic_cast<const MPC::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const MPEG::Properties*>(this))
-    return dynamic_cast<const MPEG::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const Ogg::Opus::Properties*>(this))
-    return dynamic_cast<const Ogg::Opus::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const Ogg::Speex::Properties*>(this))
-    return dynamic_cast<const Ogg::Speex::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const TrueAudio::Properties*>(this))
-    return dynamic_cast<const TrueAudio::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const RIFF::AIFF::Properties*>(this))
-    return dynamic_cast<const RIFF::AIFF::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const RIFF::WAV::Properties*>(this))
-    return dynamic_cast<const RIFF::WAV::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const Vorbis::Properties*>(this))
-    return dynamic_cast<const Vorbis::Properties*>(this)->lengthInMilliseconds();
-
-  else if(dynamic_cast<const WavPack::Properties*>(this))
-    return dynamic_cast<const WavPack::Properties*>(this)->lengthInMilliseconds();
-
-  else
-    return 0;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // protected methods
 ////////////////////////////////////////////////////////////////////////////////
 
-AudioProperties::AudioProperties(ReadStyle) :
-  d(0)
+AudioProperties::AudioProperties(ReadStyle)
 {
 
 }

taglib/audioproperties.h

@@ -34,7 +34,7 @@ namespace TagLib {
 
   /*!
    * The values here are common to most audio formats.  For more specific, codec
-   * dependent values, please see see the subclasses APIs.  This is meant to
+   * dependant values, please see see the subclasses APIs.  This is meant to
    * compliment the TagLib::File and TagLib::Tag APIs in providing a simple
    * interface that is sufficient for most applications.
    */
@@ -69,23 +69,6 @@ namespace TagLib {
      */
     virtual int length() const = 0;
 
-    /*!
-     * Returns the length of the file in seconds.  The length is rounded down to
-     * the nearest whole second.
-     *
-     * \see lengthInMilliseconds()
-     */
-    // BIC: make virtual
-    int lengthInSeconds() const;
-
-    /*!
-     * Returns the length of the file in milliseconds.
-     *
-     * \see lengthInSeconds()
-     */
-    // BIC: make virtual
-    int lengthInMilliseconds() const;
-
     /*!
      * Returns the most appropriate bit rate for the file in kb/s.  For constant
      * bitrate formats this is simply the bitrate of the file.  For variable

taglib/fileref.cpp

@@ -1,7 +1,7 @@
 /***************************************************************************
     copyright            : (C) 2002 - 2008 by Scott Wheeler
     email                : wheeler@kde.org
-
+    
     copyright            : (C) 2010 by Alex Novichkov
     email                : novichko@atnet.ru
                            (added APE file support)
@@ -27,10 +27,13 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tfile.h>
 #include <tstring.h>
 #include <tdebug.h>
-#include <trefcounter.h>
 
 #include "fileref.h"
 #include "asffile.h"
@@ -42,7 +45,6 @@
 #include "mp4file.h"
 #include "wavpackfile.h"
 #include "speexfile.h"
-#include "opusfile.h"
 #include "trueaudiofile.h"
 #include "aifffile.h"
 #include "wavfile.h"
@@ -54,176 +56,41 @@
 
 using namespace TagLib;
 
-namespace
-{
-  typedef List<const FileRef::FileTypeResolver *> ResolverList;
-  ResolverList fileTypeResolvers;
-
-  // Templatized internal functions. T should be String or IOStream*.
-
-  template <typename T>
-  FileName toFileName(T arg)
-  {
-    debug("FileRef::toFileName<T>(): This version should never be called.");
-    return FileName(L"");
-  }
-
-  template <>
-  FileName toFileName<IOStream *>(IOStream *arg)
-  {
-    return arg->name();
-  }
-
-  template <>
-  FileName toFileName<FileName>(FileName arg)
-  {
-    return arg;
-  }
-
-  template <typename T>
-  File *resolveFileType(T arg, bool readProperties,
-                        AudioProperties::ReadStyle style)
-  {
-    debug("FileRef::resolveFileType<T>(): This version should never be called.");
-    return 0;
-  }
-
-  template <>
-  File *resolveFileType<IOStream *>(IOStream *arg, bool readProperties,
-                                    AudioProperties::ReadStyle style)
-  {
-    return 0;
-  }
-
-  template <>
-  File *resolveFileType<FileName>(FileName arg, bool readProperties,
-                                  AudioProperties::ReadStyle style)
-  {
-    ResolverList::ConstIterator it = fileTypeResolvers.begin();
-    for(; it != fileTypeResolvers.end(); ++it) {
-      File *file = (*it)->createFile(arg, readProperties, style);
-      if(file)
-        return file;
-    }
-
-    return 0;
-  }
-
-  template <typename T>
-  File* createInternal(T arg, bool readAudioProperties,
-                       AudioProperties::ReadStyle audioPropertiesStyle)
-  {
-    File *file = resolveFileType(arg, readAudioProperties, audioPropertiesStyle);
-    if(file)
-      return file;
-
-#ifdef _WIN32
-    const String s = toFileName(arg).toString();
-#else
-    const String s(toFileName(arg));
-#endif
-
-    String ext;
-    const int pos = s.rfind(".");
-    if(pos != -1)
-      ext = s.substr(pos + 1).upper();
-
-    // If this list is updated, the method defaultFileExtensions() should also be
-    // updated.  However at some point that list should be created at the same time
-    // that a default file type resolver is created.
-
-    if(ext.isEmpty())
-      return 0;
-
-    if(ext == "MP3")
-      return new MPEG::File(arg, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    if(ext == "OGG")
-      return new Ogg::Vorbis::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "OGA") {
-      /* .oga can be any audio in the Ogg container. First try FLAC, then Vorbis. */
-      File *file = new Ogg::FLAC::File(arg, readAudioProperties, audioPropertiesStyle);
-      if(file->isValid())
-        return file;
-      delete file;
-      return new Ogg::Vorbis::File(arg, readAudioProperties, audioPropertiesStyle);
-    }
-    if(ext == "FLAC")
-      return new FLAC::File(arg, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
-    if(ext == "MPC")
-      return new MPC::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WV")
-      return new WavPack::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "SPX")
-      return new Ogg::Speex::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "OPUS")
-      return new Ogg::Opus::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "TTA")
-      return new TrueAudio::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2" || ext == "M4V")
-      return new MP4::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WMA" || ext == "ASF")
-      return new ASF::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "AIF" || ext == "AIFF" || ext == "AFC" || ext == "AIFC")
-      return new RIFF::AIFF::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "WAV")
-      return new RIFF::WAV::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "APE")
-      return new APE::File(arg, readAudioProperties, audioPropertiesStyle);
-    // module, nst and wow are possible but uncommon extensions
-    if(ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
-      return new Mod::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "S3M")
-      return new S3M::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "IT")
-      return new IT::File(arg, readAudioProperties, audioPropertiesStyle);
-    if(ext == "XM")
-      return new XM::File(arg, readAudioProperties, audioPropertiesStyle);
-
-    return 0;
-  }
-}
-
 class FileRef::FileRefPrivate : public RefCounter
 {
 public:
-  FileRefPrivate(File *f) :
-    RefCounter(),
-    file(f) {}
-
+  FileRefPrivate(File *f) : RefCounter(), file(f) {}
   ~FileRefPrivate() {
     delete file;
   }
 
   File *file;
+  static List<const FileTypeResolver *> fileTypeResolvers;
 };
 
+List<const FileRef::FileTypeResolver *> FileRef::FileRefPrivate::fileTypeResolvers;
+
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FileRef::FileRef() :
-  d(new FileRefPrivate(0))
+FileRef::FileRef()
 {
+  d = new FileRefPrivate(0);
 }
 
 FileRef::FileRef(FileName fileName, bool readAudioProperties,
-                 AudioProperties::ReadStyle audioPropertiesStyle) :
-  d(new FileRefPrivate(createInternal(fileName, readAudioProperties, audioPropertiesStyle)))
+                 AudioProperties::ReadStyle audioPropertiesStyle)
 {
+  d = new FileRefPrivate(create(fileName, readAudioProperties, audioPropertiesStyle));
 }
 
-FileRef::FileRef(IOStream* stream, bool readAudioProperties, AudioProperties::ReadStyle audioPropertiesStyle) :
-  d(new FileRefPrivate(createInternal(stream, readAudioProperties, audioPropertiesStyle)))
+FileRef::FileRef(File *file)
 {
+  d = new FileRefPrivate(file);
 }
 
-FileRef::FileRef(File *file) :
-  d(new FileRefPrivate(file))
-{
-}
-
-FileRef::FileRef(const FileRef &ref) :
-  d(ref.d)
+FileRef::FileRef(const FileRef &ref) : d(ref.d)
 {
   d->ref();
 }
@@ -268,7 +135,7 @@ bool FileRef::save()
 
 const FileRef::FileTypeResolver *FileRef::addFileTypeResolver(const FileRef::FileTypeResolver *resolver) // static
 {
-  fileTypeResolvers.prepend(resolver);
+  FileRefPrivate::fileTypeResolvers.prepend(resolver);
   return resolver;
 }
 
@@ -285,12 +152,10 @@ StringList FileRef::defaultFileExtensions()
   l.append("spx");
   l.append("tta");
   l.append("m4a");
-  l.append("m4r");
   l.append("m4b");
   l.append("m4p");
   l.append("3g2");
   l.append("mp4");
-  l.append("m4v");
   l.append("wma");
   l.append("asf");
   l.append("aif");
@@ -310,34 +175,104 @@ StringList FileRef::defaultFileExtensions()
 
 bool FileRef::isNull() const
 {
-  return (!d->file || !d->file->isValid());
+  return !d->file || !d->file->isValid();
 }
 
 FileRef &FileRef::operator=(const FileRef &ref)
 {
-  FileRef(ref).swap(*this);
+  if(&ref == this)
+    return *this;
+
+  if(d->deref())
+    delete d;
+
+  d = ref.d;
+  d->ref();
+
   return *this;
 }
 
-void FileRef::swap(FileRef &ref)
-{
-  using std::swap;
-
-  swap(d, ref.d);
-}
-
 bool FileRef::operator==(const FileRef &ref) const
 {
-  return (ref.d->file == d->file);
+  return ref.d->file == d->file;
 }
 
 bool FileRef::operator!=(const FileRef &ref) const
 {
-  return (ref.d->file != d->file);
+  return ref.d->file != d->file;
 }
 
 File *FileRef::create(FileName fileName, bool readAudioProperties,
                       AudioProperties::ReadStyle audioPropertiesStyle) // static
 {
-  return createInternal(fileName, readAudioProperties, audioPropertiesStyle);
+
+  List<const FileTypeResolver *>::ConstIterator it = FileRefPrivate::fileTypeResolvers.begin();
+
+  for(; it != FileRefPrivate::fileTypeResolvers.end(); ++it) {
+    File *file = (*it)->createFile(fileName, readAudioProperties, audioPropertiesStyle);
+    if(file)
+      return file;
+  }
+
+  // Ok, this is really dumb for now, but it works for testing.
+
+  String s;
+
+#ifdef _WIN32
+  s = (wcslen((const wchar_t *) fileName) > 0) ? String((const wchar_t *) fileName) : String((const char *) fileName);
+#else
+  s = fileName;
+#endif
+
+  // If this list is updated, the method defaultFileExtensions() should also be
+  // updated.  However at some point that list should be created at the same time
+  // that a default file type resolver is created.
+
+  int pos = s.rfind(".");
+  if(pos != -1) {
+    String ext = s.substr(pos + 1).upper();
+    if(ext == "MP3")
+      return new MPEG::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "OGG")
+      return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "OGA") {
+      /* .oga can be any audio in the Ogg container. First try FLAC, then Vorbis. */
+      File *file = new Ogg::FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
+      if (file->isValid())
+        return file;
+      delete file;
+      return new Ogg::Vorbis::File(fileName, readAudioProperties, audioPropertiesStyle);
+    }
+    if(ext == "FLAC")
+      return new FLAC::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "MPC")
+      return new MPC::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "WV")
+      return new WavPack::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "SPX")
+      return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "TTA")
+      return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "M4A" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2")
+      return new MP4::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "WMA" || ext == "ASF")
+      return new ASF::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "AIF" || ext == "AIFF")
+      return new RIFF::AIFF::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "WAV")
+      return new RIFF::WAV::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "APE")
+      return new APE::File(fileName, readAudioProperties, audioPropertiesStyle);
+    // module, nst and wow are possible but uncommon extensions
+    if(ext == "MOD" || ext == "MODULE" || ext == "NST" || ext == "WOW")
+      return new Mod::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "S3M")
+      return new S3M::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "IT")
+      return new IT::File(fileName, readAudioProperties, audioPropertiesStyle);
+    if(ext == "XM")
+      return new XM::File(fileName, readAudioProperties, audioPropertiesStyle);
+  }
+
+  return 0;
 }

taglib/fileref.h

@@ -72,7 +72,7 @@ namespace TagLib {
    *
    * class MyFileTypeResolver : FileTypeResolver
    * {
-   *   TagLib::File *createFile(TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
+   *   TagLib::File *createFile(TagLib::FileName *fileName, bool, AudioProperties::ReadStyle)
    *   {
    *     if(someCheckForAnMP3File(fileName))
    *       return new TagLib::MPEG::File(fileName);
@@ -128,24 +128,7 @@ namespace TagLib {
                      audioPropertiesStyle = AudioProperties::Average);
 
     /*!
-     * Construct a FileRef from an opened \a IOStream.  If \a readAudioProperties
-     * is true then the audio properties will be read using \a audioPropertiesStyle.
-     * If \a readAudioProperties is false then \a audioPropertiesStyle will be
-     * ignored.
-     *
-     * Also see the note in the class documentation about why you may not want to
-     * use this method in your application.
-     *
-     * \note TagLib will *not* take ownership of the stream, the caller is
-     * responsible for deleting it after the File object.
-     */
-    explicit FileRef(IOStream* stream,
-                     bool readAudioProperties = true,
-                     AudioProperties::ReadStyle
-                     audioPropertiesStyle = AudioProperties::Average);
-
-    /*!
-     * Construct a FileRef using \a file.  The FileRef now takes ownership of the
+     * Contruct a FileRef using \a file.  The FileRef now takes ownership of the
      * pointer and will delete the File when it passes out of scope.
      */
     explicit FileRef(File *file);
@@ -208,7 +191,7 @@ namespace TagLib {
      * is tried.
      *
      * Returns a pointer to the added resolver (the same one that's passed in --
-     * this is mostly so that static initializers have something to use for
+     * this is mostly so that static inialializers have something to use for
      * assignment).
      *
      * \see FileTypeResolver
@@ -226,7 +209,7 @@ namespace TagLib {
      * by TagLib for resolution is case-insensitive.
      *
      * \note This does not account for any additional file type resolvers that
-     * are plugged in.  Also note that this is not intended to replace a proper
+     * are plugged in.  Also note that this is not intended to replace a propper
      * mime-type resolution system, but is just here for reference.
      *
      * \see FileTypeResolver
@@ -243,11 +226,6 @@ namespace TagLib {
      */
     FileRef &operator=(const FileRef &ref);
 
-    /*!
-     * Exchanges the content of the FileRef by the content of \a ref.
-     */
-    void swap(FileRef &ref);
-
     /*!
      * Returns true if this FileRef and \a ref point to the same File object.
      */

taglib/flac/flacfile.cpp

@@ -28,8 +28,6 @@
 #include <tlist.h>
 #include <tdebug.h>
 #include <tagunion.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
 
 #include <id3v2header.h>
 #include <id3v2tag.h>
@@ -45,84 +43,89 @@ using namespace TagLib;
 
 namespace
 {
-  typedef List<FLAC::MetadataBlock *> BlockList;
-  typedef BlockList::Iterator BlockIterator;
-  typedef BlockList::Iterator BlockConstIterator;
-
-  enum { FlacXiphIndex = 0, FlacID3v2Index = 1, FlacID3v1Index = 2 };
-
-  const long MinPaddingLength = 4096;
-  const long MaxPaddingLegnth = 1024 * 1024;
-
-  const char LastBlockFlag = '\x80';
+  enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 };
+  enum { MinPaddingLength = 4096 };
+  enum { LastBlockFlag = 0x80 };
 }
 
 class FLAC::File::FilePrivate
 {
 public:
-  FilePrivate(const ID3v2::FrameFactory *frameFactory = ID3v2::FrameFactory::instance()) :
-    ID3v2FrameFactory(frameFactory),
+  FilePrivate() :
+    ID3v2FrameFactory(ID3v2::FrameFactory::instance()),
     ID3v2Location(-1),
     ID3v2OriginalSize(0),
     ID3v1Location(-1),
     properties(0),
     flacStart(0),
     streamStart(0),
-    scanned(false)
+    streamLength(0),
+    scanned(false),
+    hasXiphComment(false),
+    hasID3v2(false),
+    hasID3v1(false)
   {
-    blocks.setAutoDelete(true);
   }
 
   ~FilePrivate()
   {
+    for(uint i = 0; i < blocks.size(); i++) {
+      delete blocks[i];
+    }
     delete properties;
   }
 
   const ID3v2::FrameFactory *ID3v2FrameFactory;
   long ID3v2Location;
-  long ID3v2OriginalSize;
+  uint ID3v2OriginalSize;
 
   long ID3v1Location;
 
   TagUnion tag;
 
   Properties *properties;
+  ByteVector streamInfoData;
   ByteVector xiphCommentData;
-  BlockList blocks;
+  List<MetadataBlock *> blocks;
 
   long flacStart;
   long streamStart;
+  long streamLength;
   bool scanned;
+
+  bool hasXiphComment;
+  bool hasID3v2;
+  bool hasID3v1;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
+FLAC::File::File(FileName file, bool readProperties,
+                 Properties::ReadStyle propertiesStyle) :
+  TagLib::File(file)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
 FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
-                 bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate(frameFactory))
+                 bool readProperties, Properties::ReadStyle propertiesStyle) :
+  TagLib::File(file)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  d->ID3v2FrameFactory = frameFactory;
+  read(readProperties, propertiesStyle);
 }
 
 FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
-                 bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate(frameFactory))
+                 bool readProperties, Properties::ReadStyle propertiesStyle) :
+  TagLib::File(stream)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  d->ID3v2FrameFactory = frameFactory;
+  read(readProperties, propertiesStyle);
 }
 
 FLAC::File::~File()
@@ -135,26 +138,12 @@ TagLib::Tag *FLAC::File::tag() const
   return &d->tag;
 }
 
-PropertyMap FLAC::File::properties() const
-{
-  return d->tag.properties();
-}
-
-void FLAC::File::removeUnsupportedProperties(const StringList &unsupported)
-{
-  d->tag.removeUnsupportedProperties(unsupported);
-}
-
-PropertyMap FLAC::File::setProperties(const PropertyMap &properties)
-{
-  return xiphComment(true)->setProperties(properties);
-}
-
 FLAC::Properties *FLAC::File::audioProperties() const
 {
   return d->properties;
 }
 
+
 bool FLAC::File::save()
 {
   if(readOnly()) {
@@ -175,144 +164,96 @@ bool FLAC::File::save()
 
   // Replace metadata blocks
 
-  for(BlockIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    if((*it)->code() == MetadataBlock::VorbisComment) {
+  bool foundVorbisCommentBlock = false;
+  List<MetadataBlock *> newBlocks;
+  for(uint i = 0; i < d->blocks.size(); i++) {
+    MetadataBlock *block = d->blocks[i];
+    if(block->code() == MetadataBlock::VorbisComment) {
       // Set the new Vorbis Comment block
-      delete *it;
-      d->blocks.erase(it);
-      break;
+      delete block;
+      block = new UnknownMetadataBlock(MetadataBlock::VorbisComment, d->xiphCommentData);
+      foundVorbisCommentBlock = true;
     }
+    if(block->code() == MetadataBlock::Padding) {
+      delete block;
+      continue;
+    }
+    newBlocks.append(block);
   }
-
-  d->blocks.append(new UnknownMetadataBlock(MetadataBlock::VorbisComment, d->xiphCommentData));
+  if(!foundVorbisCommentBlock) {
+    newBlocks.append(new UnknownMetadataBlock(MetadataBlock::VorbisComment, d->xiphCommentData));
+    foundVorbisCommentBlock = true;
+  }
+  d->blocks = newBlocks;
 
   // Render data for the metadata blocks
 
   ByteVector data;
-  for(BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    ByteVector blockData = (*it)->render();
+  for(uint i = 0; i < newBlocks.size(); i++) {
+    FLAC::MetadataBlock *block = newBlocks[i];
+    ByteVector blockData = block->render();
     ByteVector blockHeader = ByteVector::fromUInt(blockData.size());
-    blockHeader[0] = (*it)->code();
+    blockHeader[0] = block->code();
     data.append(blockHeader);
     data.append(blockData);
   }
 
-  // Compute the amount of padding, and append that to data.
-  // TODO: Should be calculated in offset_t in taglib2.
+  // Adjust the padding block(s)
 
   long originalLength = d->streamStart - d->flacStart;
-  long paddingLength = originalLength - data.size() - 4;
-
-  if(paddingLength <= 0) {
+  int paddingLength = originalLength - data.size() - 4;
+  if (paddingLength < 0) {
     paddingLength = MinPaddingLength;
   }
-  else {
-    // Padding won't increase beyond 1% of the file size or 1MB.
-
-    long threshold = length() / 100;
-    threshold = std::max(threshold, MinPaddingLength);
-    threshold = std::min(threshold, MaxPaddingLegnth);
-
-    if(paddingLength > threshold)
-      paddingLength = MinPaddingLength;
-  }
-
-  ByteVector paddingHeader = ByteVector::fromUInt(paddingLength);
-  paddingHeader[0] = static_cast<char>(MetadataBlock::Padding | LastBlockFlag);
-  data.append(paddingHeader);
-  data.resize(static_cast<unsigned int>(data.size() + paddingLength));
+  ByteVector padding = ByteVector::fromUInt(paddingLength);
+  padding.resize(paddingLength + 4);
+  padding[0] = FLAC::MetadataBlock::Padding | LastBlockFlag;
+  data.append(padding);
 
   // Write the data to the file
 
   insert(data, d->flacStart, originalLength);
-
-  d->streamStart += (static_cast<long>(data.size()) - originalLength);
-
-  if(d->ID3v1Location >= 0)
-    d->ID3v1Location += (static_cast<long>(data.size()) - originalLength);
+  d->hasXiphComment = true;
 
   // Update ID3 tags
 
-  if(ID3v2Tag() && !ID3v2Tag()->isEmpty()) {
-
-    // ID3v2 tag is not empty. Update the old one or create a new one.
-
-    if(d->ID3v2Location < 0)
-      d->ID3v2Location = 0;
-
-    data = ID3v2Tag()->render();
-    insert(data, d->ID3v2Location, d->ID3v2OriginalSize);
-
-    d->flacStart   += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
-    d->streamStart += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
-
-    if(d->ID3v1Location >= 0)
-      d->ID3v1Location += (static_cast<long>(data.size()) - d->ID3v2OriginalSize);
-
-    d->ID3v2OriginalSize = data.size();
-  }
-  else {
-
-    // ID3v2 tag is empty. Remove the old one.
-
-    if(d->ID3v2Location >= 0) {
-      removeBlock(d->ID3v2Location, d->ID3v2OriginalSize);
-
-      d->flacStart   -= d->ID3v2OriginalSize;
-      d->streamStart -= d->ID3v2OriginalSize;
-
-      if(d->ID3v1Location >= 0)
-        d->ID3v1Location -= d->ID3v2OriginalSize;
-
-      d->ID3v2Location = -1;
-      d->ID3v2OriginalSize = 0;
+  if(ID3v2Tag()) {
+    if(d->hasID3v2) {
+      if(d->ID3v2Location < d->flacStart)
+        debug("FLAC::File::save() -- This can't be right -- an ID3v2 tag after the "
+              "start of the FLAC bytestream?  Not writing the ID3v2 tag.");
+      else
+        insert(ID3v2Tag()->render(), d->ID3v2Location, d->ID3v2OriginalSize);
     }
+    else
+      insert(ID3v2Tag()->render(), 0, 0);
   }
 
-  if(ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
-
-    // ID3v1 tag is not empty. Update the old one or create a new one.
-
-    if(d->ID3v1Location >= 0) {
-      seek(d->ID3v1Location);
-    }
-    else {
-      seek(0, End);
-      d->ID3v1Location = tell();
-    }
-
+  if(ID3v1Tag()) {
+    seek(-128, End);
     writeBlock(ID3v1Tag()->render());
   }
-  else {
-
-    // ID3v1 tag is empty. Remove the old one.
-
-    if(d->ID3v1Location >= 0) {
-      truncate(d->ID3v1Location);
-      d->ID3v1Location = -1;
-    }
-  }
 
   return true;
 }
 
 ID3v2::Tag *FLAC::File::ID3v2Tag(bool create)
 {
-  if(!create || d->tag[FlacID3v2Index])
-    return static_cast<ID3v2::Tag *>(d->tag[FlacID3v2Index]);
+  if(!create || d->tag[ID3v2Index])
+    return static_cast<ID3v2::Tag *>(d->tag[ID3v2Index]);
 
-  d->tag.set(FlacID3v2Index, new ID3v2::Tag);
-  return static_cast<ID3v2::Tag *>(d->tag[FlacID3v2Index]);
+  d->tag.set(ID3v2Index, new ID3v2::Tag);
+  return static_cast<ID3v2::Tag *>(d->tag[ID3v2Index]);
 }
 
 ID3v1::Tag *FLAC::File::ID3v1Tag(bool create)
 {
-  return d->tag.access<ID3v1::Tag>(FlacID3v1Index, create);
+  return d->tag.access<ID3v1::Tag>(ID3v1Index, create);
 }
 
 Ogg::XiphComment *FLAC::File::xiphComment(bool create)
 {
-  return d->tag.access<Ogg::XiphComment>(FlacXiphIndex, create);
+  return d->tag.access<Ogg::XiphComment>(XiphIndex, create);
 }
 
 void FLAC::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory)
@@ -320,108 +261,37 @@ void FLAC::File::setID3v2FrameFactory(const ID3v2::FrameFactory *factory)
   d->ID3v2FrameFactory = factory;
 }
 
-ByteVector FLAC::File::streamInfoData()
-{
-  debug("FLAC::File::streamInfoData() -- This function is obsolete. Returning an empty ByteVector.");
-  return ByteVector();
-}
-
-long FLAC::File::streamLength()
-{
-  debug("FLAC::File::streamLength() -- This function is obsolete. Returning zero.");
-  return 0;
-}
-
-List<FLAC::Picture *> FLAC::File::pictureList()
-{
-  List<Picture *> pictures;
-  for(BlockConstIterator it = d->blocks.begin(); it != d->blocks.end(); ++it) {
-    Picture *picture = dynamic_cast<Picture *>(*it);
-    if(picture) {
-      pictures.append(picture);
-    }
-  }
-  return pictures;
-}
-
-void FLAC::File::addPicture(Picture *picture)
-{
-  d->blocks.append(picture);
-}
-
-void FLAC::File::removePicture(Picture *picture, bool del)
-{
-  BlockIterator it = d->blocks.find(picture);
-  if(it != d->blocks.end())
-    d->blocks.erase(it);
-
-  if(del)
-    delete picture;
-}
-
-void FLAC::File::removePictures()
-{
-  for(BlockIterator it = d->blocks.begin(); it != d->blocks.end(); ) {
-    if(dynamic_cast<Picture *>(*it)) {
-      delete *it;
-      it = d->blocks.erase(it);
-    }
-    else {
-      ++it;
-    }
-  }
-}
-
-void FLAC::File::strip(int tags)
-{
-  if(tags & ID3v1)
-    d->tag.set(FlacID3v1Index, 0);
-
-  if(tags & ID3v2)
-    d->tag.set(FlacID3v2Index, 0);
-
-  if(tags & XiphComment) {
-    xiphComment()->removeAllFields();
-    xiphComment()->removeAllPictures();
-  }
-}
-
-bool FLAC::File::hasXiphComment() const
-{
-  return !d->xiphCommentData.isEmpty();
-}
-
-bool FLAC::File::hasID3v1Tag() const
-{
-  return (d->ID3v1Location >= 0);
-}
-
-bool FLAC::File::hasID3v2Tag() const
-{
-  return (d->ID3v2Location >= 0);
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void FLAC::File::read(bool readProperties)
+void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle)
 {
   // Look for an ID3v2 tag
 
-  d->ID3v2Location = Utils::findID3v2(this);
+  d->ID3v2Location = findID3v2();
 
   if(d->ID3v2Location >= 0) {
-    d->tag.set(FlacID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory));
+
+    d->tag.set(ID3v2Index, new ID3v2::Tag(this, d->ID3v2Location, d->ID3v2FrameFactory));
+
     d->ID3v2OriginalSize = ID3v2Tag()->header()->completeTagSize();
+
+    if(ID3v2Tag()->header()->tagSize() <= 0)
+      d->tag.set(ID3v2Index, 0);
+    else
+      d->hasID3v2 = true;
   }
 
   // Look for an ID3v1 tag
 
-  d->ID3v1Location = Utils::findID3v1(this);
+  d->ID3v1Location = findID3v1();
 
-  if(d->ID3v1Location >= 0)
-    d->tag.set(FlacID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+  if(d->ID3v1Location >= 0) {
+    d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+    d->hasID3v1 = true;
+  }
 
   // Look for FLAC metadata, including vorbis comments
 
@@ -430,26 +300,28 @@ void FLAC::File::read(bool readProperties)
   if(!isValid())
     return;
 
-  if(!d->xiphCommentData.isEmpty())
-    d->tag.set(FlacXiphIndex, new Ogg::XiphComment(d->xiphCommentData));
+  if(d->hasXiphComment)
+    d->tag.set(XiphIndex, new Ogg::XiphComment(xiphCommentData()));
   else
-    d->tag.set(FlacXiphIndex, new Ogg::XiphComment());
+    d->tag.set(XiphIndex, new Ogg::XiphComment);
 
-  if(readProperties) {
+  if(readProperties)
+    d->properties = new Properties(streamInfoData(), streamLength(), propertiesStyle);
+}
 
-    // First block should be the stream_info metadata
+ByteVector FLAC::File::streamInfoData()
+{
+  return isValid() ? d->streamInfoData : ByteVector();
+}
 
-    const ByteVector infoData = d->blocks.front()->render();
+ByteVector FLAC::File::xiphCommentData() const
+{
+  return (isValid() && d->hasXiphComment) ? d->xiphCommentData : ByteVector();
+}
 
-    long streamLength;
-
-    if(d->ID3v1Location >= 0)
-      streamLength = d->ID3v1Location - d->streamStart;
-    else
-      streamLength = length() - d->streamStart;
-
-    d->properties = new Properties(infoData, streamLength);
-  }
+long FLAC::File::streamLength()
+{
+  return d->streamLength;
 }
 
 void FLAC::File::scan()
@@ -464,7 +336,7 @@ void FLAC::File::scan()
 
   long nextBlockOffset;
 
-  if(d->ID3v2Location >= 0)
+  if(d->hasID3v2)
     nextBlockOffset = find("fLaC", d->ID3v2Location + d->ID3v2OriginalSize);
   else
     nextBlockOffset = find("fLaC");
@@ -478,44 +350,47 @@ void FLAC::File::scan()
   nextBlockOffset += 4;
   d->flacStart = nextBlockOffset;
 
-  while(true) {
+  seek(nextBlockOffset);
 
-    seek(nextBlockOffset);
-    const ByteVector header = readBlock(4);
+  ByteVector header = readBlock(4);
 
-    // Header format (from spec):
-    // <1> Last-metadata-block flag
-    // <7> BLOCK_TYPE
-    //    0 : STREAMINFO
-    //    1 : PADDING
-    //    ..
-    //    4 : VORBIS_COMMENT
-    //    ..
-    //    6 : PICTURE
-    //    ..
-    // <24> Length of metadata to follow
+  // Header format (from spec):
+  // <1> Last-metadata-block flag
+  // <7> BLOCK_TYPE
+  //    0 : STREAMINFO
+  //    1 : PADDING
+  //    ..
+  //    4 : VORBIS_COMMENT
+  //    ..
+  // <24> Length of metadata to follow
 
-    const char blockType = header[0] & ~LastBlockFlag;
-    const bool isLastBlock = (header[0] & LastBlockFlag) != 0;
-    const unsigned int blockLength = header.toUInt(1U, 3U);
+  char blockType = header[0] & 0x7f;
+  bool isLastBlock = (header[0] & 0x80) != 0;
+  uint length = header.mid(1, 3).toUInt();
 
-    // First block should be the stream_info metadata
+  // First block should be the stream_info metadata
 
-    if(d->blocks.isEmpty() && blockType != MetadataBlock::StreamInfo) {
-      debug("FLAC::File::scan() -- First block should be the stream_info metadata");
-      setValid(false);
-      return;
-    }
+  if(blockType != MetadataBlock::StreamInfo) {
+    debug("FLAC::File::scan() -- invalid FLAC stream");
+    setValid(false);
+    return;
+  }
 
-    if(blockLength == 0 && blockType != MetadataBlock::Padding) {
-      debug("FLAC::File::scan() -- Zero-sized metadata block found");
-      setValid(false);
-      return;
-    }
+  d->streamInfoData = readBlock(length);
+  d->blocks.append(new UnknownMetadataBlock(blockType, d->streamInfoData));
+  nextBlockOffset += length + 4;
 
-    const ByteVector data = readBlock(blockLength);
-    if(data.size() != blockLength) {
-      debug("FLAC::File::scan() -- Failed to read a metadata block");
+  // Search through the remaining metadata
+  while(!isLastBlock) {
+
+    header = readBlock(4);
+    blockType = header[0] & 0x7f;
+    isLastBlock = (header[0] & 0x80) != 0;
+    length = header.mid(1, 3).toUInt();
+
+    ByteVector data = readBlock(length);
+    if(data.size() != length) {
+      debug("FLAC::File::scan() -- FLAC stream corrupted");
       setValid(false);
       return;
     }
@@ -524,12 +399,12 @@ void FLAC::File::scan()
 
     // Found the vorbis-comment
     if(blockType == MetadataBlock::VorbisComment) {
-      if(d->xiphCommentData.isEmpty()) {
+      if(!d->hasXiphComment) {
         d->xiphCommentData = data;
-        block = new UnknownMetadataBlock(MetadataBlock::VorbisComment, data);
+        d->hasXiphComment = true;
       }
       else {
-        debug("FLAC::File::scan() -- multiple Vorbis Comment blocks found, discarding");
+        debug("FLAC::File::scan() -- multiple Vorbis Comment blocks found, using the first one");
       }
     }
     else if(blockType == MetadataBlock::Picture) {
@@ -538,29 +413,98 @@ void FLAC::File::scan()
         block = picture;
       }
       else {
-        debug("FLAC::File::scan() -- invalid picture found, discarding");
+        debug("FLAC::File::scan() -- invalid picture found, discarting");
         delete picture;
       }
     }
-    else if(blockType == MetadataBlock::Padding) {
-      // Skip all padding blocks.
-    }
-    else {
+
+    if(!block) {
       block = new UnknownMetadataBlock(blockType, data);
     }
-
-    if(block)
+    if(block->code() != MetadataBlock::Padding) {
       d->blocks.append(block);
+    }
+    else {
+      delete block;
+    }
 
-    nextBlockOffset += blockLength + 4;
+    nextBlockOffset += length + 4;
 
-    if(isLastBlock)
-      break;
+    if(nextBlockOffset >= File::length()) {
+      debug("FLAC::File::scan() -- FLAC stream corrupted");
+      setValid(false);
+      return;
+    }
+    seek(nextBlockOffset);
   }
 
   // End of metadata, now comes the datastream
 
   d->streamStart = nextBlockOffset;
+  d->streamLength = File::length() - d->streamStart;
+
+  if(d->hasID3v1)
+    d->streamLength -= 128;
 
   d->scanned = true;
 }
+
+long FLAC::File::findID3v1()
+{
+  if(!isValid())
+    return -1;
+
+  seek(-128, End);
+  long p = tell();
+
+  if(readBlock(3) == ID3v1::Tag::fileIdentifier())
+    return p;
+
+  return -1;
+}
+
+long FLAC::File::findID3v2()
+{
+  if(!isValid())
+    return -1;
+
+  seek(0);
+
+  if(readBlock(3) == ID3v2::Header::fileIdentifier())
+    return 0;
+
+  return -1;
+}
+
+List<FLAC::Picture *> FLAC::File::pictureList()
+{
+  List<Picture *> pictures;
+  for(uint i = 0; i < d->blocks.size(); i++) {
+    Picture *picture = dynamic_cast<Picture *>(d->blocks[i]);
+    if(picture) {
+      pictures.append(picture);
+    }
+  }
+  return pictures;
+}
+
+void FLAC::File::addPicture(Picture *picture)
+{
+  d->blocks.append(picture);
+}
+
+void FLAC::File::removePictures()
+{
+  List<MetadataBlock *> newBlocks;
+  for(uint i = 0; i < d->blocks.size(); i++) {
+    Picture *picture = dynamic_cast<Picture *>(d->blocks[i]);
+    if(picture) {
+      delete picture;
+    }
+    else {
+      newBlocks.append(d->blocks[i]);
+    }
+  }
+  d->blocks = newBlocks;
+}
+

taglib/flac/flacfile.h

@@ -29,7 +29,6 @@
 #include "taglib_export.h"
 #include "tfile.h"
 #include "tlist.h"
-#include "tag.h"
 
 #include "flacpicture.h"
 #include "flacproperties.h"
@@ -37,6 +36,7 @@
 namespace TagLib {
 
   class Tag;
+
   namespace ID3v2 { class FrameFactory; class Tag; }
   namespace ID3v1 { class Tag; }
   namespace Ogg { class XiphComment; }
@@ -46,7 +46,7 @@ namespace TagLib {
   /*!
    * This is implementation of FLAC metadata for non-Ogg FLAC files.  At some
    * point when Ogg / FLAC is more common there will be a similar implementation
-   * under the Ogg hierarchy.
+   * under the Ogg hiearchy.
    *
    * This supports ID3v1, ID3v2 and Xiph style comments as well as reading stream
    * properties from the file.
@@ -67,27 +67,9 @@ namespace TagLib {
     {
     public:
       /*!
-       * This set of flags is used for various operations and is suitable for
-       * being OR-ed together.
-       */
-      enum TagTypes {
-        //! Empty set.  Matches no tag types.
-        NoTags      = 0x0000,
-        //! Matches Vorbis comments.
-        XiphComment = 0x0001,
-        //! Matches ID3v1 tags.
-        ID3v1       = 0x0002,
-        //! Matches ID3v2 tags.
-        ID3v2       = 0x0004,
-        //! Matches all tag types.
-        AllTags     = 0xffff
-      };
-
-      /*!
-       * Constructs a FLAC file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
+       * Contructs a FLAC 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.
        *
        * \deprecated This constructor will be dropped in favor of the one below
        * in a future version.
@@ -96,13 +78,12 @@ namespace TagLib {
            Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
-       * Constructs an FLAC file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
+       * Contructs a FLAC 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.
        *
        * If this file contains and ID3v2 tag the frames will be created using
        * \a frameFactory.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
        */
       // BIC: merge with the above constructor
       File(FileName file, ID3v2::FrameFactory *frameFactory,
@@ -110,16 +91,12 @@ namespace TagLib {
            Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
-       * Constructs a FLAC file from \a stream.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
+       * Contructs a FLAC 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.
        *
        * If this file contains and ID3v2 tag the frames will be created using
        * \a frameFactory.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
        */
       // BIC: merge with the above constructor
       File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
@@ -141,25 +118,6 @@ namespace TagLib {
        */
       virtual TagLib::Tag *tag() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * If the file contains more than one tag (e.g. XiphComment and ID3v1),
-       * only the first one (in the order XiphComment, ID3v2, ID3v1) will be
-       * converted to the PropertyMap.
-       */
-      PropertyMap properties() const;
-
-      void removeUnsupportedProperties(const StringList &);
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * This always creates a Xiph comment, if none exists. The return value
-       * relates to the Xiph comment only.
-       * Ignores any changes to ID3v1 or ID3v2 comments since they are not allowed
-       * in the FLAC specification.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the FLAC::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.
@@ -178,57 +136,39 @@ namespace TagLib {
       /*!
        * Returns a pointer to the ID3v2 tag of the file.
        *
-       * If \a create is false (the default) this returns a null pointer
+       * If \a create is false (the default) this will return a null pointer
        * if there is no valid ID3v2 tag.  If \a create is true it will create
-       * an ID3v2 tag if one does not exist and returns a valid pointer.
+       * an ID3v2 tag if one does not exist.
        *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an ID3v2 tag.  Use hasID3v2Tag() to check if the file
-       * on disk actually has an ID3v2 tag.
-       *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
+       * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasID3v2Tag()
        */
       ID3v2::Tag *ID3v2Tag(bool create = false);
 
       /*!
        * Returns a pointer to the ID3v1 tag of the file.
        *
-       * If \a create is false (the default) this returns a null pointer
-       * if there is no valid APE tag.  If \a create is true it will create
-       * an APE tag if one does not exist and returns a valid pointer.
+       * If \a create is false (the default) this will return a null pointer
+       * if there is no valid ID3v1 tag.  If \a create is true it will create
+       * an ID3v1 tag if one does not exist.
        *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an ID3v1 tag.  Use hasID3v1Tag() to check if the file
-       * on disk actually has an ID3v1 tag.
-       *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
+       * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasID3v1Tag()
        */
       ID3v1::Tag *ID3v1Tag(bool create = false);
 
       /*!
        * Returns a pointer to the XiphComment for the file.
        *
-       * If \a create is false (the default) this returns a null pointer
+       * If \a create is false (the default) this will return a null pointer
        * if there is no valid XiphComment.  If \a create is true it will create
-       * a XiphComment if one does not exist and returns a valid pointer.
-       *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has a XiphComment.  Use hasXiphComment() to check if the
-       * file on disk actually has a XiphComment.
+       * a XiphComment if one does not exist.
        *
        * \note The Tag <b>is still</b> owned by the FLAC::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasXiphComment()
        */
       Ogg::XiphComment *xiphComment(bool create = false);
 
@@ -238,7 +178,6 @@ namespace TagLib {
        * when
        *
        * \see ID3v2FrameFactory
-       * \deprecated This value should be passed in via the constructor
        */
       void setID3v2FrameFactory(const ID3v2::FrameFactory *factory);
 
@@ -246,7 +185,7 @@ namespace TagLib {
        * Returns the block of data used by FLAC::Properties for parsing the
        * stream properties.
        *
-       * \deprecated Always returns an empty vector.
+       * \deprecated This method will not be public in a future release.
        */
       ByteVector streamInfoData(); // BIC: remove
 
@@ -254,7 +193,7 @@ namespace TagLib {
        * Returns the length of the audio-stream, used by FLAC::Properties for
        * calculating the bitrate.
        *
-       * \deprecated Always returns zero.
+       * \deprecated This method will not be public in a future release.
        */
       long streamLength();  // BIC: remove
 
@@ -263,12 +202,6 @@ namespace TagLib {
        */
       List<Picture *> pictureList();
 
-      /*!
-       * Removes an attached picture. If \a del is true the picture's memory
-       * will be freed; if it is false, it must be deleted by the user.
-       */
-      void removePicture(Picture *picture, bool del = true);
-
       /*!
        * Remove all attached images.
        */
@@ -282,48 +215,16 @@ namespace TagLib {
        */
       void addPicture(Picture *picture);
 
-      /*!
-       * This will remove the tags that match the OR-ed together TagTypes from
-       * the file.  By default it removes all tags.
-       *
-       * \warning This will also invalidate pointers to the tags as their memory
-       * will be freed.
-       *
-       * \note In order to make the removal permanent save() still needs to be
-       * called.
-       *
-       * \note This won't remove the Vorbis comment block completely.  The
-       * vendor ID will be preserved.
-       */
-      void strip(int tags = AllTags);
-
-      /*!
-       * Returns whether or not the file on disk actually has a XiphComment.
-       *
-       * \see xiphComment()
-       */
-      bool hasXiphComment() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v1 tag.
-       *
-       * \see ID3v1Tag()
-       */
-      bool hasID3v1Tag() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v2 tag.
-       *
-       * \see ID3v2Tag()
-       */
-      bool hasID3v2Tag() const;
-
     private:
       File(const File &);
       File &operator=(const File &);
 
-      void read(bool readProperties);
+      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
       void scan();
+      long findID3v2();
+      long findID3v1();
+      ByteVector xiphCommentData() const;
+      long findPaddingBreak(long nextPageOffset, long targetOffset, bool *isLast);
 
       class FilePrivate;
       FilePrivate *d;

taglib/flac/flacmetadatablock.cpp

@@ -23,13 +23,17 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
 #include "flacmetadatablock.h"
 
 using namespace TagLib;
 
-class FLAC::MetadataBlock::MetadataBlockPrivate
+class FLAC::MetadataBlock::MetadataBlockPrivate 
 {
 public:
   MetadataBlockPrivate() {}

taglib/flac/flacpicture.cpp

@@ -23,13 +23,17 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
 #include "flacpicture.h"
 
 using namespace TagLib;
 
-class FLAC::Picture::PicturePrivate
+class FLAC::Picture::PicturePrivate 
 {
 public:
   PicturePrivate() :
@@ -78,10 +82,10 @@ bool FLAC::Picture::parse(const ByteVector &data)
     return false;
   }
 
-  unsigned int pos = 0;
-  d->type = FLAC::Picture::Type(data.toUInt(pos));
+  int pos = 0;
+  d->type = FLAC::Picture::Type(data.mid(pos, 4).toUInt());
   pos += 4;
-  unsigned int mimeTypeLength = data.toUInt(pos);
+  uint mimeTypeLength = data.mid(pos, 4).toUInt();
   pos += 4;
   if(pos + mimeTypeLength + 24 > data.size()) {
     debug("Invalid picture block.");
@@ -89,7 +93,7 @@ bool FLAC::Picture::parse(const ByteVector &data)
   }
   d->mimeType = String(data.mid(pos, mimeTypeLength), String::UTF8);
   pos += mimeTypeLength;
-  unsigned int descriptionLength = data.toUInt(pos);
+  uint descriptionLength = data.mid(pos, 4).toUInt();
   pos += 4;
   if(pos + descriptionLength + 20 > data.size()) {
     debug("Invalid picture block.");
@@ -97,15 +101,15 @@ bool FLAC::Picture::parse(const ByteVector &data)
   }
   d->description = String(data.mid(pos, descriptionLength), String::UTF8);
   pos += descriptionLength;
-  d->width = data.toUInt(pos);
+  d->width = data.mid(pos, 4).toUInt();
   pos += 4;
-  d->height = data.toUInt(pos);
+  d->height = data.mid(pos, 4).toUInt();
   pos += 4;
-  d->colorDepth = data.toUInt(pos);
+  d->colorDepth = data.mid(pos, 4).toUInt();
   pos += 4;
-  d->numColors = data.toUInt(pos);
+  d->numColors = data.mid(pos, 4).toUInt();
   pos += 4;
-  unsigned int dataLength = data.toUInt(pos);
+  uint dataLength = data.mid(pos, 4).toUInt();
   pos += 4;
   if(pos + dataLength > data.size()) {
     debug("Invalid picture block.");
@@ -113,7 +117,7 @@ bool FLAC::Picture::parse(const ByteVector &data)
   }
   d->data = data.mid(pos, dataLength);
 
-  return true;
+  return true;  
 }
 
 ByteVector FLAC::Picture::render() const

taglib/flac/flacproperties.cpp

@@ -34,20 +34,24 @@ using namespace TagLib;
 class FLAC::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate() :
+  PropertiesPrivate(ByteVector d, long st, ReadStyle s) :
+    data(d),
+    streamLength(st),
+    style(s),
     length(0),
     bitrate(0),
     sampleRate(0),
-    bitsPerSample(0),
-    channels(0),
-    sampleFrames(0) {}
+    sampleWidth(0),
+    channels(0) {}
 
+  ByteVector data;
+  long streamLength;
+  ReadStyle style;
   int length;
   int bitrate;
   int sampleRate;
-  int bitsPerSample;
+  int sampleWidth;
   int channels;
-  unsigned long long sampleFrames;
   ByteVector signature;
 };
 
@@ -55,18 +59,16 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-FLAC::Properties::Properties(ByteVector data, long streamLength, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
+FLAC::Properties::Properties(ByteVector data, long streamLength, ReadStyle style) : AudioProperties(style)
 {
-  read(data, streamLength);
+  d = new PropertiesPrivate(data, streamLength, style);
+  read();
 }
 
-FLAC::Properties::Properties(File *, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
+FLAC::Properties::Properties(File *file, ReadStyle style) : AudioProperties(style)
 {
-  debug("FLAC::Properties::Properties() - This constructor is no longer used.");
+  d = new PropertiesPrivate(file->streamInfoData(), file->streamLength(), style);
+  read();
 }
 
 FLAC::Properties::~Properties()
@@ -75,16 +77,6 @@ FLAC::Properties::~Properties()
 }
 
 int FLAC::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int FLAC::Properties::lengthInSeconds() const
-{
-  return d->length / 1000;
-}
-
-int FLAC::Properties::lengthInMilliseconds() const
 {
   return d->length;
 }
@@ -99,14 +91,9 @@ int FLAC::Properties::sampleRate() const
   return d->sampleRate;
 }
 
-int FLAC::Properties::bitsPerSample() const
-{
-  return d->bitsPerSample;
-}
-
 int FLAC::Properties::sampleWidth() const
 {
-  return bitsPerSample();
+  return d->sampleWidth;
 }
 
 int FLAC::Properties::channels() const
@@ -114,11 +101,6 @@ int FLAC::Properties::channels() const
   return d->channels;
 }
 
-unsigned long long FLAC::Properties::sampleFrames() const
-{
-  return d->sampleFrames;
-}
-
 ByteVector FLAC::Properties::signature() const
 {
   return d->signature;
@@ -128,14 +110,14 @@ ByteVector FLAC::Properties::signature() const
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void FLAC::Properties::read(const ByteVector &data, long streamLength)
+void FLAC::Properties::read()
 {
-  if(data.size() < 18) {
+  if(d->data.size() < 18) {
     debug("FLAC::Properties::read() - FLAC properties must contain at least 18 bytes.");
     return;
   }
 
-  unsigned int pos = 0;
+  int pos = 0;
 
   // Minimum block size (in samples)
   pos += 2;
@@ -149,28 +131,28 @@ void FLAC::Properties::read(const ByteVector &data, long streamLength)
   // Maximum frame size (in bytes)
   pos += 3;
 
-  const unsigned int flags = data.toUInt(pos, true);
-  pos += 4;
-
-  d->sampleRate    = flags >> 12;
-  d->channels      = ((flags >> 9) &  7) + 1;
-  d->bitsPerSample = ((flags >> 4) & 31) + 1;
+  uint flags = d->data.mid(pos, 4).toUInt(true);
+  d->sampleRate = flags >> 12;
+  d->channels = ((flags >> 9) & 7) + 1;
+  d->sampleWidth = ((flags >> 4) & 31) + 1;
 
   // The last 4 bits are the most significant 4 bits for the 36 bit
   // stream length in samples. (Audio files measured in days)
 
-  const unsigned long long hi = flags & 0xf;
-  const unsigned long long lo = data.toUInt(pos, true);
+  uint highLength =d->sampleRate > 0 ? (((flags & 0xf) << 28) / d->sampleRate) << 4 : 0;
   pos += 4;
 
-  d->sampleFrames = (hi << 32) | lo;
+  d->length = d->sampleRate > 0 ?
+      (d->data.mid(pos, 4).toUInt(true)) / d->sampleRate + highLength : 0;
+  pos += 4;
 
-  if(d->sampleFrames > 0 && d->sampleRate > 0) {
-    const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length  = static_cast<int>(length + 0.5);
-    d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-  }
+  // Uncompressed bitrate:
 
-  if(data.size() >= pos + 16)
-    d->signature = data.mid(pos, 16);
+  //d->bitrate = ((d->sampleRate * d->channels) / 1000) * d->sampleWidth;
+
+  // Real bitrate:
+
+  d->bitrate = d->length > 0 ? ((d->streamLength * 8UL) / d->length) / 1000 : 0;
+
+  d->signature = d->data.mid(pos, 32);
 }

taglib/flac/flacproperties.h

@@ -64,72 +64,22 @@ namespace TagLib {
        */
       virtual ~Properties();
 
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
+      // Reimplementations.
+
       virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \see lengthInMilliseconds()
-       */
-      // BIC: make virtual
-      int lengthInSeconds() const;
-
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
-
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
       virtual int bitrate() const;
-
-      /*!
-       * Returns the sample rate in Hz.
-       */
       virtual int sampleRate() const;
-
-      /*!
-       * Returns the number of audio channels.
-       */
       virtual int channels() const;
 
-      /*!
-       * Returns the number of bits per audio sample as read from the FLAC
-       * identification header.
-       */
-      int bitsPerSample() const;
-
       /*!
        * Returns the sample width as read from the FLAC identification
        * header.
-       *
-       * \note This method is just an alias of bitsPerSample().
-       *
-       * \deprecated
        */
       int sampleWidth() const;
 
-      /*!
-       * Return the number of sample frames.
-       */
-      unsigned long long sampleFrames() const;
-
       /*!
        * Returns the MD5 signature of the uncompressed audio stream as read
-       * from the stream info header.
+       * from the stream info header header.
        */
       ByteVector signature() const;
 
@@ -137,7 +87,7 @@ namespace TagLib {
       Properties(const Properties &);
       Properties &operator=(const Properties &);
 
-      void read(const ByteVector &data, long streamLength);
+      void read();
 
       class PropertiesPrivate;
       PropertiesPrivate *d;

taglib/flac/flacunknownmetadatablock.cpp

@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
 #include <tstring.h>
@@ -30,7 +34,7 @@
 
 using namespace TagLib;
 
-class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
+class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate 
 {
 public:
   UnknownMetadataBlockPrivate() : code(0) {}

taglib/it/itfile.cpp

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,20 +15,14 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-
 #include "tstringlist.h"
 #include "itfile.h"
 #include "tdebug.h"
 #include "modfileprivate.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace IT;
@@ -50,8 +44,7 @@ IT::File::File(FileName file, bool readProperties,
   Mod::FileBase(file),
   d(new FilePrivate(propertiesStyle))
 {
-  if(isOpen())
-    read(readProperties);
+  read(readProperties);
 }
 
 IT::File::File(IOStream *stream, bool readProperties,
@@ -59,8 +52,7 @@ IT::File::File(IOStream *stream, bool readProperties,
   Mod::FileBase(stream),
   d(new FilePrivate(propertiesStyle))
 {
-  if(isOpen())
-    read(readProperties);
+  read(readProperties);
 }
 
 IT::File::~File()
@@ -73,16 +65,6 @@ Mod::Tag *IT::File::tag() const
   return &d->tag;
 }
 
-PropertyMap IT::File::properties() const
-{
-  return d->tag.properties();
-}
-
-PropertyMap IT::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag.setProperties(properties);
-}
-
 IT::Properties *IT::File::audioProperties() const
 {
   return &d->properties;
@@ -101,9 +83,9 @@ bool IT::File::save()
 
   seek(2, Current);
 
-  unsigned short length = 0;
-  unsigned short instrumentCount = 0;
-  unsigned short sampleCount = 0;
+  ushort length = 0;
+  ushort instrumentCount = 0;
+  ushort sampleCount = 0;
 
   if(!readU16L(length) || !readU16L(instrumentCount) || !readU16L(sampleCount))
     return false;
@@ -112,9 +94,9 @@ bool IT::File::save()
 
   // write comment as instrument and sample names:
   StringList lines = d->tag.comment().split("\n");
-  for(unsigned short i = 0; i < instrumentCount; ++ i) {
+  for(ushort i = 0; i < instrumentCount; ++ i) {
     seek(192L + length + ((long)i << 2));
-    unsigned long instrumentOffset = 0;
+    ulong instrumentOffset = 0;
     if(!readU32L(instrumentOffset))
       return false;
 
@@ -123,28 +105,28 @@ bool IT::File::save()
     if(i < lines.size())
       writeString(lines[i], 25);
     else
-      writeString(String(), 25);
+      writeString(String::null, 25);
     writeByte(0);
   }
 
-  for(unsigned short i = 0; i < sampleCount; ++ i) {
+  for(ushort i = 0; i < sampleCount; ++ i) {
     seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
-    unsigned long sampleOffset = 0;
+    ulong sampleOffset = 0;
     if(!readU32L(sampleOffset))
       return false;
-
+    
     seek(sampleOffset + 20);
 
-    if((unsigned int)(i + instrumentCount) < lines.size())
+    if((i + instrumentCount) < lines.size())
       writeString(lines[i + instrumentCount], 25);
     else
-      writeString(String(), 25);
+      writeString(String::null, 25);
     writeByte(0);
   }
 
   // write rest as message:
   StringList messageLines;
-  for(unsigned int i = instrumentCount + sampleCount; i < lines.size(); ++ i)
+  for(uint i = instrumentCount + sampleCount; i < lines.size(); ++ i)
     messageLines.append(lines[i]);
   ByteVector message = messageLines.toString("\r").data(String::Latin1);
 
@@ -154,15 +136,15 @@ bool IT::File::save()
     message.resize(7999);
   message.append((char)0);
 
-  unsigned short special = 0;
-  unsigned short messageLength = 0;
-  unsigned long  messageOffset = 0;
+  ushort special = 0;
+  ushort messageLength = 0;
+  ulong  messageOffset = 0;
 
   seek(46);
   if(!readU16L(special))
     return false;
 
-  unsigned long fileSize = File::length();
+  long fileSize = this->length();
   if(special & Properties::MessageAttached) {
     seek(54);
     if(!readU16L(messageLength) || !readU32L(messageOffset))
@@ -178,7 +160,7 @@ bool IT::File::save()
     writeU16L(special | 0x1);
   }
 
-  if(messageOffset + messageLength >= fileSize) {
+  if((messageOffset + messageLength) >= fileSize) {
     // append new message
     seek(54);
     writeU16L(message.size());
@@ -213,7 +195,7 @@ void IT::File::read(bool)
   READ_U16L_AS(length);
   READ_U16L_AS(instrumentCount);
   READ_U16L_AS(sampleCount);
-
+  
   d->properties.setInstrumentCount(instrumentCount);
   d->properties.setSampleCount(sampleCount);
   READ_U16L(d->properties.setPatternCount);
@@ -258,14 +240,13 @@ void IT::File::read(bool)
     // But this always gives 64 channels for all my files anyway.
     // Strangely VLC does report other values. I wonder how VLC
     // gets it's values.
-    if((unsigned char) pannings[i] < 128 && volumes[i] > 0)
-        ++channels;
+    if(pannings[i] < 128 && volumes[i] > 0) ++ channels;
   }
   d->properties.setChannels(channels);
-
+  
   // real length might be shorter because of skips and terminator
-  unsigned short realLength = 0;
-  for(unsigned short i = 0; i < length; ++ i) {
+  ushort realLength = 0;
+  for(ushort i = 0; i < length; ++ i) {
     READ_BYTE_AS(order);
     if(order == 255) break;
     if(order != 254) ++ realLength;
@@ -279,7 +260,7 @@ void IT::File::read(bool)
   //       Currently I just discard anything after a nil, but
   //       e.g. VLC seems to interprete a nil as a space. I
   //       don't know what is the proper behaviour.
-  for(unsigned short i = 0; i < instrumentCount; ++ i) {
+  for(ushort i = 0; i < instrumentCount; ++ i) {
     seek(192L + length + ((long)i << 2));
     READ_U32L_AS(instrumentOffset);
     seek(instrumentOffset);
@@ -294,11 +275,11 @@ void IT::File::read(bool)
     READ_STRING_AS(instrumentName, 26);
     comment.append(instrumentName);
   }
-
-  for(unsigned short i = 0; i < sampleCount; ++ i) {
+  
+  for(ushort i = 0; i < sampleCount; ++ i) {
     seek(192L + length + ((long)instrumentCount << 2) + ((long)i << 2));
     READ_U32L_AS(sampleOffset);
-
+    
     seek(sampleOffset);
 
     ByteVector sampleMagic = readBlock(4);
@@ -324,7 +305,7 @@ void IT::File::read(bool)
     READ_BYTE_AS(vibratoRate);
     READ_BYTE_AS(vibratoType);
     */
-
+    
     comment.append(sampleName);
   }
 

taglib/it/itfile.h

@@ -36,27 +36,20 @@ namespace TagLib {
     class TAGLIB_EXPORT File : public Mod::FileBase {
       public:
         /*!
-         * Constructs a Impulse Tracker file from \a file.
-         *
-         * \note In the current implementation, both \a readProperties and
-         * \a propertiesStyle are ignored.  The audio properties are always
-         * read.
+         * Contructs a Impulse Tracker 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(FileName file, bool readProperties = true,
              AudioProperties::ReadStyle propertiesStyle =
              AudioProperties::Average);
 
         /*!
-         * Constructs a Impulse Tracker file from \a stream.
-         *
-         * \note In the current implementation, both \a readProperties and
-         * \a propertiesStyle are ignored.  The audio properties are always
-         * read.
-         *
-         * \note TagLib will *not* take ownership of the stream, the caller is
-         * responsible for deleting it after the File object.
+         * Contructs a Impulse Tracker file from \a stream. 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,
+        File(IOStream *stram, bool readProperties = true,
              AudioProperties::ReadStyle propertiesStyle =
              AudioProperties::Average);
 
@@ -67,18 +60,6 @@ namespace TagLib {
 
         Mod::Tag *tag() const;
 
-        /*!
-         * Forwards to Mod::Tag::properties().
-         * BIC: will be removed once File::toDict() is made virtual
-         */
-        PropertyMap properties() const;
-
-        /*!
-         * Forwards to Mod::Tag::setProperties().
-         * BIC: will be removed once File::setProperties() is made virtual
-         */
-        PropertyMap setProperties(const PropertyMap &);
-
         /*!
          * Returns the IT::Properties for this file. If no audio properties
          * were read then this will return a null pointer.
@@ -93,7 +74,6 @@ namespace TagLib {
          */
         bool save();
 
-
       private:
         File(const File &);
         File &operator=(const File &);

taglib/it/itproperties.cpp

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,15 +15,10 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-
 #include "itproperties.h"
 
 using namespace TagLib;
@@ -51,21 +46,21 @@ public:
   {
   }
 
-  int            channels;
-  unsigned short lengthInPatterns;
-  unsigned short instrumentCount;
-  unsigned short sampleCount;
-  unsigned short patternCount;
-  unsigned short version;
-  unsigned short compatibleVersion;
-  unsigned short flags;
-  unsigned short special;
-  unsigned char  globalVolume;
-  unsigned char  mixVolume;
-  unsigned char  tempo;
-  unsigned char  bpmSpeed;
-  unsigned char  panningSeparation;
-  unsigned char  pitchWheelDepth;
+  int    channels;
+  ushort lengthInPatterns;
+  ushort instrumentCount;
+  ushort sampleCount;
+  ushort patternCount;
+  ushort version;
+  ushort compatibleVersion;
+  ushort flags;
+  ushort special;
+  uchar  globalVolume;
+  uchar  mixVolume;
+  uchar  tempo;
+  uchar  bpmSpeed;
+  uchar  panningSeparation;
+  uchar  pitchWheelDepth;
 };
 
 IT::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
@@ -84,16 +79,6 @@ int IT::Properties::length() const
   return 0;
 }
 
-int IT::Properties::lengthInSeconds() const
-{
-  return 0;
-}
-
-int IT::Properties::lengthInMilliseconds() const
-{
-  return 0;
-}
-
 int IT::Properties::bitrate() const
 {
   return 0;
@@ -109,7 +94,7 @@ int IT::Properties::channels() const
   return d->channels;
 }
 
-unsigned short IT::Properties::lengthInPatterns() const
+ushort IT::Properties::lengthInPatterns() const
 {
   return d->lengthInPatterns;
 }
@@ -119,67 +104,67 @@ bool IT::Properties::stereo() const
   return d->flags & Stereo;
 }
 
-unsigned short IT::Properties::instrumentCount() const
+ushort IT::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }
 
-unsigned short IT::Properties::sampleCount() const
+ushort IT::Properties::sampleCount() const
 {
   return d->sampleCount;
 }
 
-unsigned short IT::Properties::patternCount() const
+ushort IT::Properties::patternCount() const
 {
   return d->patternCount;
 }
 
-unsigned short IT::Properties::version() const
+ushort IT::Properties::version() const
 {
   return d->version;
 }
 
-unsigned short IT::Properties::compatibleVersion() const
+ushort IT::Properties::compatibleVersion() const
 {
   return d->compatibleVersion;
 }
 
-unsigned short IT::Properties::flags() const
+ushort IT::Properties::flags() const
 {
   return d->flags;
 }
 
-unsigned short IT::Properties::special() const
+ushort IT::Properties::special() const
 {
   return d->special;
 }
 
-unsigned char IT::Properties::globalVolume() const
+uchar IT::Properties::globalVolume() const
 {
   return d->globalVolume;
 }
 
-unsigned char IT::Properties::mixVolume() const
+uchar IT::Properties::mixVolume() const
 {
   return d->mixVolume;
 }
 
-unsigned char IT::Properties::tempo() const
+uchar IT::Properties::tempo() const
 {
   return d->tempo;
 }
 
-unsigned char IT::Properties::bpmSpeed() const
+uchar IT::Properties::bpmSpeed() const
 {
   return d->bpmSpeed;
 }
 
-unsigned char IT::Properties::panningSeparation() const
+uchar IT::Properties::panningSeparation() const
 {
   return d->panningSeparation;
 }
 
-unsigned char IT::Properties::pitchWheelDepth() const
+uchar IT::Properties::pitchWheelDepth() const
 {
   return d->pitchWheelDepth;
 }
@@ -189,72 +174,72 @@ void IT::Properties::setChannels(int channels)
   d->channels = channels;
 }
 
-void IT::Properties::setLengthInPatterns(unsigned short lengthInPatterns)
+void IT::Properties::setLengthInPatterns(ushort lengthInPatterns)
 {
   d->lengthInPatterns = lengthInPatterns;
 }
 
-void IT::Properties::setInstrumentCount(unsigned short instrumentCount)
+void IT::Properties::setInstrumentCount(ushort instrumentCount)
 {
   d->instrumentCount = instrumentCount;
 }
 
-void IT::Properties::setSampleCount(unsigned short sampleCount)
+void IT::Properties::setSampleCount(ushort sampleCount)
 {
   d->sampleCount = sampleCount;
 }
 
-void IT::Properties::setPatternCount(unsigned short patternCount)
+void IT::Properties::setPatternCount(ushort patternCount)
 {
   d->patternCount = patternCount;
 }
 
-void IT::Properties::setFlags(unsigned short flags)
+void IT::Properties::setFlags(ushort flags)
 {
   d->flags = flags;
 }
 
-void IT::Properties::setSpecial(unsigned short special)
+void IT::Properties::setSpecial(ushort special)
 {
   d->special = special;
 }
 
-void IT::Properties::setCompatibleVersion(unsigned short compatibleVersion)
+void IT::Properties::setCompatibleVersion(ushort compatibleVersion)
 {
   d->compatibleVersion = compatibleVersion;
 }
 
-void IT::Properties::setVersion(unsigned short version)
+void IT::Properties::setVersion(ushort version)
 {
   d->version = version;
 }
 
-void IT::Properties::setGlobalVolume(unsigned char globalVolume)
+void IT::Properties::setGlobalVolume(uchar globalVolume)
 {
   d->globalVolume = globalVolume;
 }
 
-void IT::Properties::setMixVolume(unsigned char mixVolume)
+void IT::Properties::setMixVolume(uchar mixVolume)
 {
   d->mixVolume = mixVolume;
 }
 
-void IT::Properties::setTempo(unsigned char tempo)
+void IT::Properties::setTempo(uchar tempo)
 {
   d->tempo = tempo;
 }
 
-void IT::Properties::setBpmSpeed(unsigned char bpmSpeed)
+void IT::Properties::setBpmSpeed(uchar bpmSpeed)
 {
   d->bpmSpeed = bpmSpeed;
 }
 
-void IT::Properties::setPanningSeparation(unsigned char panningSeparation)
+void IT::Properties::setPanningSeparation(uchar panningSeparation)
 {
   d->panningSeparation = panningSeparation;
 }
 
-void IT::Properties::setPitchWheelDepth(unsigned char pitchWheelDepth)
+void IT::Properties::setPitchWheelDepth(uchar pitchWheelDepth)
 {
   d->pitchWheelDepth = pitchWheelDepth;
 }

taglib/it/itproperties.h

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,12 +15,8 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
 #ifndef TAGLIB_ITPROPERTIES_H
@@ -54,45 +50,45 @@ namespace TagLib {
 
       Properties(AudioProperties::ReadStyle propertiesStyle);
       virtual ~Properties();
+      
+      int length()     const;
+      int bitrate()    const;
+      int sampleRate() const;
+      int channels()   const;
 
-      int length()               const;
-      int lengthInSeconds()      const;
-      int lengthInMilliseconds() const;
-      int bitrate()              const;
-      int sampleRate()           const;
-      int channels()             const;
-
-      unsigned short lengthInPatterns()  const;
-      bool           stereo()            const;
-      unsigned short instrumentCount()   const;
-      unsigned short sampleCount()       const;
-      unsigned short patternCount()      const;
-      unsigned short version()           const;
-      unsigned short compatibleVersion() const;
-      unsigned short flags()             const;
-      unsigned short special()           const;
-      unsigned char  globalVolume()      const;
-      unsigned char  mixVolume()         const;
-      unsigned char  tempo()             const;
-      unsigned char  bpmSpeed()          const;
-      unsigned char  panningSeparation() const;
-      unsigned char  pitchWheelDepth()   const;
+      ushort lengthInPatterns()  const;
+      bool   stereo()            const;
+      ushort instrumentCount()   const;
+      ushort sampleCount()       const;
+      ushort patternCount()      const;
+      ushort version()           const;
+      ushort compatibleVersion() const;
+      ushort flags()             const;
+      ushort special()           const;
+      uchar  globalVolume()      const;
+      uchar  mixVolume()         const;
+      uchar  tempo()             const;
+      uchar  bpmSpeed()          const;
+      uchar  panningSeparation() const;
+      uchar  pitchWheelDepth()   const;
 
+    protected:
       void setChannels(int channels);
-      void setLengthInPatterns(unsigned short lengthInPatterns);
-      void setInstrumentCount(unsigned short instrumentCount);
-      void setSampleCount (unsigned short sampleCount);
-      void setPatternCount(unsigned short patternCount);
-      void setVersion     (unsigned short version);
-      void setCompatibleVersion(unsigned short compatibleVersion);
-      void setFlags       (unsigned short flags);
-      void setSpecial     (unsigned short special);
-      void setGlobalVolume(unsigned char globalVolume);
-      void setMixVolume   (unsigned char mixVolume);
-      void setTempo       (unsigned char tempo);
-      void setBpmSpeed    (unsigned char bpmSpeed);
-      void setPanningSeparation(unsigned char panningSeparation);
-      void setPitchWheelDepth  (unsigned char pitchWheelDepth);
+
+      void setLengthInPatterns(ushort lengthInPatterns);
+      void setInstrumentCount(ushort instrumentCount);
+      void setSampleCount (ushort sampleCount);
+      void setPatternCount(ushort patternCount);
+      void setVersion     (ushort version);
+      void setCompatibleVersion(ushort compatibleVersion);
+      void setFlags       (ushort flags);
+      void setSpecial     (ushort special);
+      void setGlobalVolume(uchar globalVolume);
+      void setMixVolume   (uchar mixVolume);
+      void setTempo       (uchar tempo);
+      void setBpmSpeed    (uchar bpmSpeed);
+      void setPanningSeparation(uchar panningSeparation);
+      void setPitchWheelDepth  (uchar pitchWheelDepth);
 
     private:
       Properties(const Properties&);

taglib/mod/modfile.cpp

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,20 +15,14 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-
 #include "modfile.h"
 #include "tstringlist.h"
 #include "tdebug.h"
 #include "modfileprivate.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace Mod;
@@ -50,8 +44,7 @@ Mod::File::File(FileName file, bool readProperties,
   Mod::FileBase(file),
   d(new FilePrivate(propertiesStyle))
 {
-  if(isOpen())
-    read(readProperties);
+  read(readProperties);
 }
 
 Mod::File::File(IOStream *stream, bool readProperties,
@@ -59,8 +52,7 @@ Mod::File::File(IOStream *stream, bool readProperties,
   Mod::FileBase(stream),
   d(new FilePrivate(propertiesStyle))
 {
-  if(isOpen())
-    read(readProperties);
+  read(readProperties);
 }
 
 Mod::File::~File()
@@ -78,16 +70,6 @@ Mod::Properties *Mod::File::audioProperties() const
   return &d->properties;
 }
 
-PropertyMap Mod::File::properties() const
-{
-  return d->tag.properties();
-}
-
-PropertyMap Mod::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag.setProperties(properties);
-}
-
 bool Mod::File::save()
 {
   if(readOnly()) {
@@ -97,14 +79,14 @@ bool Mod::File::save()
   seek(0);
   writeString(d->tag.title(), 20);
   StringList lines = d->tag.comment().split("\n");
-  unsigned int n = std::min(lines.size(), d->properties.instrumentCount());
-  for(unsigned int i = 0; i < n; ++ i) {
+  uint n = std::min(lines.size(), d->properties.instrumentCount());
+  for(uint i = 0; i < n; ++ i) {
     writeString(lines[i], 22);
     seek(8, Current);
   }
 
-  for(unsigned int i = n; i < d->properties.instrumentCount(); ++ i) {
-    writeString(String(), 22);
+  for(uint i = n; i < d->properties.instrumentCount(); ++ i) {
+    writeString(String::null, 22);
     seek(8, Current);
   }
   return true;
@@ -119,8 +101,8 @@ void Mod::File::read(bool)
   ByteVector modId = readBlock(4);
   READ_ASSERT(modId.size() == 4);
 
-  int          channels    =  4;
-  unsigned int instruments = 31;
+  int  channels    =  4;
+  uint instruments = 31;
   if(modId == "M.K." || modId == "M!K!" || modId == "M&K!" || modId == "N.T.") {
     d->tag.setTrackerName("ProTracker");
     channels = 4;
@@ -164,7 +146,7 @@ void Mod::File::read(bool)
   READ_STRING(d->tag.setTitle, 20);
 
   StringList comment;
-  for(unsigned int i = 0; i < instruments; ++ i) {
+  for(uint i = 0; i < instruments; ++ i) {
     READ_STRING_AS(instrumentName, 22);
     // value in words, * 2 (<< 1) for bytes:
     READ_U16B_AS(sampleLength);

taglib/mod/modfile.h

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,12 +15,8 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
 #ifndef TAGLIB_MODFILE_H
@@ -37,78 +33,57 @@ namespace TagLib {
 
   namespace Mod {
 
-    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase
-    {
-    public:
-      /*!
-       * Constructs a Protracker file from \a file.
-       *
-       * \note In the current implementation, both \a readProperties and
-       * \a propertiesStyle are ignored.  The audio properties are always
-       * read.
-       */
-      File(FileName file, bool readProperties = true,
-           AudioProperties::ReadStyle propertiesStyle =
-           AudioProperties::Average);
+    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase {
+      public:
+        /*!
+         * Contructs a Protracker 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(FileName file, bool readProperties = true,
+             AudioProperties::ReadStyle propertiesStyle =
+             AudioProperties::Average);
 
-      /*!
-       * Constructs a Protracker file from \a stream.
-       *
-       * \note In the current implementation, both \a readProperties and
-       * \a propertiesStyle are ignored.  The audio properties are always
-       * read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
-       */
-      File(IOStream *stream, bool readProperties = true,
-           AudioProperties::ReadStyle propertiesStyle =
-           AudioProperties::Average);
+        /*!
+         * Contructs a Protracker file from \a stream. 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,
+             AudioProperties::ReadStyle propertiesStyle =
+             AudioProperties::Average);
 
-      /*!
-       * Destroys this instance of the File.
-       */
-      virtual ~File();
+        /*!
+         * Destroys this instance of the File.
+         */
+        virtual ~File();
 
-      Mod::Tag *tag() const;
+        Mod::Tag *tag() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * Forwards to Mod::Tag::properties().
-       */
-      PropertyMap properties() const;
+        /*!
+         * Returns the Mod::Properties for this file. If no audio properties
+         * were read then this will return a null pointer.
+         */
+        Mod::Properties *audioProperties() const;
 
-      /*!
-       * Implements the unified property interface -- import function.
-       * Forwards to Mod::Tag::setProperties().
-       */
-      PropertyMap setProperties(const PropertyMap &);
-      /*!
-       * Returns the Mod::Properties for this file. If no audio properties
-       * were read then this will return a null pointer.
-       */
-      Mod::Properties *audioProperties() const;
+        /*!
+         * Save the file.
+         * This is the same as calling save(AllTags);
+         *
+         * \note Saving Protracker tags is not supported.
+         */
+        bool save();
 
-      /*!
-       * Save the file.
-       * This is the same as calling save(AllTags);
-       *
-       * \note Saving Protracker tags is not supported.
-       */
-      bool save();
+      private:
+        File(const File &);
+        File &operator=(const File &);
 
-    private:
-      File(const File &);
-      File &operator=(const File &);
+        void read(bool readProperties);
 
-      void read(bool readProperties);
-
-      class FilePrivate;
-      FilePrivate *d;
+        class FilePrivate;
+        FilePrivate *d;
     };
-
   }
-
 }
 
 #endif

taglib/mod/modfilebase.cpp

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,15 +15,10 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-
 #include "tdebug.h"
 #include "modfilebase.h"
 
@@ -38,14 +33,14 @@ Mod::FileBase::FileBase(IOStream *stream) : TagLib::File(stream)
 {
 }
 
-void Mod::FileBase::writeString(const String &s, unsigned long size, char padding)
+void Mod::FileBase::writeString(const String &s, ulong size, char padding)
 {
   ByteVector data(s.data(String::Latin1));
   data.resize(size, padding);
   writeBlock(data);
 }
 
-bool Mod::FileBase::readString(String &s, unsigned long size)
+bool Mod::FileBase::readString(String &s, ulong size)
 {
   ByteVector data(readBlock(size));
   if(data.size() < size) return false;
@@ -54,39 +49,39 @@ bool Mod::FileBase::readString(String &s, unsigned long size)
   {
     data.resize(index);
   }
-  data.replace('\xff', ' ');
+  data.replace((char) 0xff, ' ');
 
   s = data;
   return true;
 }
 
-void Mod::FileBase::writeByte(unsigned char byte)
+void Mod::FileBase::writeByte(uchar byte)
 {
   ByteVector data(1, byte);
   writeBlock(data);
 }
 
-void Mod::FileBase::writeU16L(unsigned short number)
+void Mod::FileBase::writeU16L(ushort number)
 {
   writeBlock(ByteVector::fromShort(number, false));
 }
 
-void Mod::FileBase::writeU32L(unsigned long number)
+void Mod::FileBase::writeU32L(ulong number)
 {
   writeBlock(ByteVector::fromUInt(number, false));
 }
 
-void Mod::FileBase::writeU16B(unsigned short number)
+void Mod::FileBase::writeU16B(ushort number)
 {
   writeBlock(ByteVector::fromShort(number, true));
 }
 
-void Mod::FileBase::writeU32B(unsigned long number)
+void Mod::FileBase::writeU32B(ulong number)
 {
   writeBlock(ByteVector::fromUInt(number, true));
 }
 
-bool Mod::FileBase::readByte(unsigned char &byte)
+bool Mod::FileBase::readByte(uchar &byte)
 {
   ByteVector data(readBlock(1));
   if(data.size() < 1) return false;
@@ -94,7 +89,7 @@ bool Mod::FileBase::readByte(unsigned char &byte)
   return true;
 }
 
-bool Mod::FileBase::readU16L(unsigned short &number)
+bool Mod::FileBase::readU16L(ushort &number)
 {
   ByteVector data(readBlock(2));
   if(data.size() < 2) return false;
@@ -102,14 +97,14 @@ bool Mod::FileBase::readU16L(unsigned short &number)
   return true;
 }
 
-bool Mod::FileBase::readU32L(unsigned long &number) {
+bool Mod::FileBase::readU32L(ulong &number) {
   ByteVector data(readBlock(4));
   if(data.size() < 4) return false;
   number = data.toUInt(false);
   return true;
 }
 
-bool Mod::FileBase::readU16B(unsigned short &number)
+bool Mod::FileBase::readU16B(ushort &number)
 {
   ByteVector data(readBlock(2));
   if(data.size() < 2) return false;
@@ -117,7 +112,7 @@ bool Mod::FileBase::readU16B(unsigned short &number)
   return true;
 }
 
-bool Mod::FileBase::readU32B(unsigned long &number) {
+bool Mod::FileBase::readU32B(ulong &number) {
   ByteVector data(readBlock(4));
   if(data.size() < 4) return false;
   number = data.toUInt(true);

taglib/mod/modfilebase.h

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,12 +15,8 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
 #ifndef TAGLIB_MODFILEBASE_H
@@ -35,32 +31,28 @@
 #include <algorithm>
 
 namespace TagLib {
-
   namespace Mod {
-
     class TAGLIB_EXPORT FileBase : public TagLib::File
     {
     protected:
       FileBase(FileName file);
       FileBase(IOStream *stream);
 
-      void writeString(const String &s, unsigned long size, char padding = 0);
-      void writeByte(unsigned char byte);
-      void writeU16L(unsigned short number);
-      void writeU32L(unsigned long number);
-      void writeU16B(unsigned short number);
-      void writeU32B(unsigned long number);
+      void writeString(const String &s, ulong size, char padding = 0);
+      void writeByte(uchar byte);
+      void writeU16L(ushort number);
+      void writeU32L(ulong number);
+      void writeU16B(ushort number);
+      void writeU32B(ulong number);
 
-      bool readString(String &s, unsigned long size);
-      bool readByte(unsigned char &byte);
-      bool readU16L(unsigned short &number);
-      bool readU32L(unsigned long &number);
-      bool readU16B(unsigned short &number);
-      bool readU32B(unsigned long &number);
+      bool readString(String &s, ulong size);
+      bool readByte(uchar &byte);
+      bool readU16L(ushort &number);
+      bool readU32L(ulong &number);
+      bool readU16B(ushort &number);
+      bool readU32B(ulong &number);
     };
-
   }
-
 }
 
 #endif

taglib/mod/modfileprivate.h

@@ -37,11 +37,11 @@
     setter(number); \
   }
 
-#define READ_BYTE(setter) READ(setter,unsigned char,readByte)
-#define READ_U16L(setter) READ(setter,unsigned short,readU16L)
-#define READ_U32L(setter) READ(setter,unsigned long,readU32L)
-#define READ_U16B(setter) READ(setter,unsigned short,readU16B)
-#define READ_U32B(setter) READ(setter,unsigned long,readU32B)
+#define READ_BYTE(setter) READ(setter,uchar,readByte)
+#define READ_U16L(setter) READ(setter,ushort,readU16L)
+#define READ_U32L(setter) READ(setter,ulong,readU32L)
+#define READ_U16B(setter) READ(setter,ushort,readU16B)
+#define READ_U32B(setter) READ(setter,ulong,readU32B)
 
 #define READ_STRING(setter,size) \
   { \
@@ -54,11 +54,11 @@
   type name = 0; \
   READ_ASSERT(read(name));
 
-#define READ_BYTE_AS(name) READ_AS(unsigned char,name,readByte)
-#define READ_U16L_AS(name) READ_AS(unsigned short,name,readU16L)
-#define READ_U32L_AS(name) READ_AS(unsigned long,name,readU32L)
-#define READ_U16B_AS(name) READ_AS(unsigned short,name,readU16B)
-#define READ_U32B_AS(name) READ_AS(unsigned long,name,readU32B)
+#define READ_BYTE_AS(name) READ_AS(uchar,name,readByte)
+#define READ_U16L_AS(name) READ_AS(ushort,name,readU16L)
+#define READ_U32L_AS(name) READ_AS(ulong,name,readU32L)
+#define READ_U16B_AS(name) READ_AS(ushort,name,readU16B)
+#define READ_U32B_AS(name) READ_AS(ulong,name,readU32B)
 
 #define READ_STRING_AS(name,size) \
   String name; \

taglib/mod/modproperties.cpp

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,15 +15,10 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-
 #include "modproperties.h"
 
 using namespace TagLib;
@@ -38,10 +33,10 @@ public:
     lengthInPatterns(0)
   {
   }
-
-  int           channels;
-  unsigned int  instrumentCount;
-  unsigned char lengthInPatterns;
+  
+  int   channels;
+  uint  instrumentCount;
+  uchar lengthInPatterns;
 };
 
 Mod::Properties::Properties(AudioProperties::ReadStyle propertiesStyle) :
@@ -60,16 +55,6 @@ int Mod::Properties::length() const
   return 0;
 }
 
-int Mod::Properties::lengthInSeconds() const
-{
-  return 0;
-}
-
-int Mod::Properties::lengthInMilliseconds() const
-{
-  return 0;
-}
-
 int Mod::Properties::bitrate() const
 {
   return 0;
@@ -85,12 +70,12 @@ int Mod::Properties::channels() const
   return d->channels;
 }
 
-unsigned int Mod::Properties::instrumentCount() const
+uint Mod::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }
 
-unsigned char Mod::Properties::lengthInPatterns() const
+uchar Mod::Properties::lengthInPatterns() const
 {
   return d->lengthInPatterns;
 }
@@ -100,12 +85,12 @@ void Mod::Properties::setChannels(int channels)
   d->channels = channels;
 }
 
-void Mod::Properties::setInstrumentCount(unsigned int instrumentCount)
+void Mod::Properties::setInstrumentCount(uint instrumentCount)
 {
   d->instrumentCount = instrumentCount;
 }
 
-void Mod::Properties::setLengthInPatterns(unsigned char lengthInPatterns)
+void Mod::Properties::setLengthInPatterns(uchar lengthInPatterns)
 {
   d->lengthInPatterns = lengthInPatterns;
 }

taglib/mod/modproperties.h

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,12 +15,8 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
 #ifndef TAGLIB_MODPROPERTIES_H
@@ -30,42 +26,35 @@
 #include "audioproperties.h"
 
 namespace TagLib {
-
   namespace Mod {
-
-    class TAGLIB_EXPORT Properties : public AudioProperties
-    {
+    class TAGLIB_EXPORT Properties : public AudioProperties {
+      friend class File;
     public:
       Properties(AudioProperties::ReadStyle propertiesStyle);
       virtual ~Properties();
+      
+      int length()     const;
+      int bitrate()    const;
+      int sampleRate() const;
+      int channels()   const;
 
-      int length()               const;
-      int lengthInSeconds()      const;
-      int lengthInMilliseconds() const;
-      int bitrate()              const;
-      int sampleRate()           const;
-      int channels()             const;
-
-      unsigned int  instrumentCount()  const;
-      unsigned char lengthInPatterns() const;
+      uint  instrumentCount()  const;
+      uchar lengthInPatterns() const;
 
+    protected:
       void setChannels(int channels);
 
-      void setInstrumentCount(unsigned int sampleCount);
-      void setLengthInPatterns(unsigned char lengthInPatterns);
+      void setInstrumentCount(uint sampleCount);
+      void setLengthInPatterns(uchar lengthInPatterns);
 
     private:
-      friend class File;
-
       Properties(const Properties&);
       Properties &operator=(const Properties&);
 
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };
-
   }
-
 }
 
 #endif

taglib/mod/modtag.cpp

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,18 +15,11 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
-
 #include "modtag.h"
-#include "tstringlist.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace Mod;
@@ -60,12 +53,12 @@ String Mod::Tag::title() const
 
 String Mod::Tag::artist() const
 {
-  return String();
+  return String::null;
 }
 
 String Mod::Tag::album() const
 {
-  return String();
+  return String::null;
 }
 
 String Mod::Tag::comment() const
@@ -75,15 +68,15 @@ String Mod::Tag::comment() const
 
 String Mod::Tag::genre() const
 {
-  return String();
+  return String::null;
 }
 
-unsigned int Mod::Tag::year() const
+uint Mod::Tag::year() const
 {
   return 0;
 }
 
-unsigned int Mod::Tag::track() const
+uint Mod::Tag::track() const
 {
   return 0;
 }
@@ -115,11 +108,11 @@ void Mod::Tag::setGenre(const String &)
 {
 }
 
-void Mod::Tag::setYear(unsigned int)
+void Mod::Tag::setYear(uint)
 {
 }
 
-void Mod::Tag::setTrack(unsigned int)
+void Mod::Tag::setTrack(uint)
 {
 }
 
@@ -127,47 +120,3 @@ void Mod::Tag::setTrackerName(const String &trackerName)
 {
   d->trackerName = trackerName;
 }
-
-PropertyMap Mod::Tag::properties() const
-{
-  PropertyMap properties;
-  properties["TITLE"] = d->title;
-  properties["COMMENT"] = d->comment;
-  if(!(d->trackerName.isEmpty()))
-    properties["TRACKERNAME"] = d->trackerName;
-  return properties;
-}
-
-PropertyMap Mod::Tag::setProperties(const PropertyMap &origProps)
-{
-  PropertyMap properties(origProps);
-  properties.removeEmpty();
-  StringList oneValueSet;
-  if(properties.contains("TITLE")) {
-    d->title = properties["TITLE"].front();
-    oneValueSet.append("TITLE");
-  } else
-    d->title.clear();
-
-  if(properties.contains("COMMENT")) {
-    d->comment = properties["COMMENT"].front();
-    oneValueSet.append("COMMENT");
-  } else
-    d->comment.clear();
-
-  if(properties.contains("TRACKERNAME")) {
-    d->trackerName = properties["TRACKERNAME"].front();
-    oneValueSet.append("TRACKERNAME");
-  } else
-    d->trackerName.clear();
-
-  // for each tag that has been set above, remove the first entry in the corresponding
-  // value list. The others will be returned as unsupported by this format.
-  for(StringList::ConstIterator it = oneValueSet.begin(); it != oneValueSet.end(); ++it) {
-    if(properties[*it].size() == 1)
-      properties.erase(*it);
-    else
-      properties[*it].erase( properties[*it].begin() );
-  }
-  return properties;
-}

taglib/mod/modtag.h

@@ -5,7 +5,7 @@
 
 /***************************************************************************
  *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
+ *   it  under the terms of the GNU Lesser General Public License version  *
  *   2.1 as published by the Free Software Foundation.                     *
  *                                                                         *
  *   This library is distributed in the hope that it will be useful, but   *
@@ -15,12 +15,8 @@
  *                                                                         *
  *   You should have received a copy of the GNU Lesser General Public      *
  *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,            *
+ *   MA  02110-1301  USA                                                   *
  ***************************************************************************/
 
 #ifndef TAGLIB_MODTAG_H
@@ -29,9 +25,7 @@
 #include "tag.h"
 
 namespace TagLib {
-
   namespace Mod {
-
     /*!
      * Tags for module files (Mod, S3M, IT, XM).
      *
@@ -54,39 +48,39 @@ namespace TagLib {
        * Returns the track name; if no track name is present in the tag
        * String::null will be returned.
        */
-      virtual String title() const;
+      String title() const;
 
       /*!
        * Not supported by module files.  Therefore always returns String::null.
        */
-      virtual String artist() const;
+      String artist() const;
 
       /*!
        * Not supported by module files.  Therefore always returns String::null.
        */
-      virtual String album() const;
+      String album() const;
 
       /*!
        * Returns the track comment derived from the instrument/sample/pattern
        * names; if no comment is present in the tag String::null will be
        * returned.
        */
-      virtual String comment() const;
+      String comment() const;
 
       /*!
        * Not supported by module files.  Therefore always returns String::null.
        */
-      virtual String genre() const;
+      String genre() const;
 
       /*!
        * Not supported by module files.  Therefore always returns 0.
        */
-      virtual unsigned int year() const;
+      uint year() const;
 
       /*!
        * Not supported by module files.  Therefore always returns 0.
        */
-      virtual unsigned int track() const;
+      uint track() const;
 
       /*!
        * Returns the name of the tracker used to create/edit the module file.
@@ -101,21 +95,21 @@ namespace TagLib {
        * Sets the title to \a title.  If \a title is String::null then this
        * value will be cleared.
        *
-       * The length limits per file type are (1 character = 1 byte):
+       * The length limits per file type are (1 characetr = 1 byte):
        * Mod 20 characters, S3M 27 characters, IT 25 characters and XM 20
        * characters.
        */
-      virtual void setTitle(const String &title);
+      void setTitle(const String &title);
 
       /*!
        * Not supported by module files and therefore ignored.
        */
-      virtual void setArtist(const String &artist);
+      void setArtist(const String &artist);
 
       /*!
        * Not supported by module files and therefore ignored.
        */
-      virtual void setAlbum(const String &album);
+      void setAlbum(const String &album);
 
       /*!
        * Sets the comment to \a comment.  If \a comment is String::null then
@@ -130,55 +124,39 @@ namespace TagLib {
        * an thus the line length in comments are limited. Too big comments
        * will be truncated.
        *
-       * The line length limits per file type are (1 character = 1 byte):
+       * The line length limits per file type are (1 characetr = 1 byte):
        * Mod 22 characters, S3M 27 characters, IT 25 characters and XM 22
        * characters.
        */
-      virtual void setComment(const String &comment);
+      void setComment(const String &comment);
 
       /*!
        * Not supported by module files and therefore ignored.
        */
-      virtual void setGenre(const String &genre);
+      void setGenre(const String &genre);
 
       /*!
        * Not supported by module files and therefore ignored.
        */
-      virtual void setYear(unsigned int year);
+      void setYear(uint year);
 
       /*!
        * Not supported by module files and therefore ignored.
        */
-      virtual void setTrack(unsigned int track);
+      void setTrack(uint track);
 
       /*!
        * Sets the tracker name to \a trackerName.  If \a trackerName is
        * String::null then this value will be cleared.
-       *
+       * 
        * Note that only XM files support this tag.  Setting the
        * tracker name for other module file formats will be ignored.
-       *
+       * 
        * The length of this tag is limited to 20 characters (1 character
        * = 1 byte).
        */
       void setTrackerName(const String &trackerName);
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * Since the module tag is very limited, the exported map is as well.
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * Because of the limitations of the module file tag, any tags besides
-       * COMMENT, TITLE and, if it is an XM file, TRACKERNAME, will be
-       * returned. Additionally, if the map contains tags with multiple values,
-       * all but the first will be contained in the returned map of unsupported
-       * properties.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
     private:
       Tag(const Tag &);
       Tag &operator=(const Tag &);
@@ -186,9 +164,7 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-
   }
-
 }
 
 #endif

taglib/mp4/mp4atom.cpp

@@ -23,7 +23,9 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <climits>
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <tdebug.h>
 #include <tstring.h>
@@ -39,11 +41,9 @@ const char *MP4::Atom::containers[11] = {
 
 MP4::Atom::Atom(File *file)
 {
-  children.setAutoDelete(true);
-
   offset = file->tell();
   ByteVector header = file->readBlock(8);
-  if(header.size() != 8) {
+  if (header.size() != 8) {
     // The atom header must be 8 bytes long, otherwise there is either
     // trailing garbage or the file is truncated
     debug("MP4: Couldn't read 8 bytes of data for atom header");
@@ -52,27 +52,22 @@ MP4::Atom::Atom(File *file)
     return;
   }
 
-  length = header.toUInt();
+  length = header.mid(0, 4).toUInt();
 
-  if(length == 1) {
-    const long long longLength = file->readBlock(8).toLongLong();
-    if(sizeof(long) == sizeof(long long)) {
-      length = static_cast<long>(longLength);
+  if (length == 1) {
+    long long longLength = file->readBlock(8).toLongLong();
+    if (longLength >= 8 && longLength <= 0xFFFFFFFF) {
+        // The atom has a 64-bit length, but it's actually a 32-bit value
+        length = (long)longLength;
     }
     else {
-      if(longLength <= LONG_MAX) {
-        // The atom has a 64-bit length, but it's actually a 31-bit value
-        length = static_cast<long>(longLength);
-      }
-      else {
         debug("MP4: 64-bit atoms are not supported");
         length = 0;
         file->seek(0, File::End);
         return;
-      }
     }
   }
-  if(length < 8) {
+  if (length < 8) {
     debug("MP4: Invalid atom size");
     length = 0;
     file->seek(0, File::End);
@@ -92,7 +87,7 @@ MP4::Atom::Atom(File *file)
       while(file->tell() < offset + length) {
         MP4::Atom *child = new MP4::Atom(file);
         children.append(child);
-        if(child->length == 0)
+        if (child->length == 0)
           return;
       }
       return;
@@ -104,6 +99,10 @@ MP4::Atom::Atom(File *file)
 
 MP4::Atom::~Atom()
 {
+  for(unsigned int i = 0; i < children.size(); i++) {
+    delete children[i];
+  }
+  children.clear();
 }
 
 MP4::Atom *
@@ -112,9 +111,9 @@ MP4::Atom::find(const char *name1, const char *name2, const char *name3, const c
   if(name1 == 0) {
     return this;
   }
-  for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name1) {
-      return (*it)->find(name2, name3, name4);
+  for(unsigned int i = 0; i < children.size(); i++) {
+    if(children[i]->name == name1) {
+      return children[i]->find(name2, name3, name4);
     }
   }
   return 0;
@@ -124,12 +123,12 @@ MP4::AtomList
 MP4::Atom::findall(const char *name, bool recursive)
 {
   MP4::AtomList result;
-  for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name) {
-      result.append(*it);
+  for(unsigned int i = 0; i < children.size(); i++) {
+    if(children[i]->name == name) {
+      result.append(children[i]);
     }
     if(recursive) {
-      result.append((*it)->findall(name, recursive));
+      result.append(children[i]->findall(name, recursive));
     }
   }
   return result;
@@ -142,9 +141,9 @@ MP4::Atom::path(MP4::AtomList &path, const char *name1, const char *name2, const
   if(name1 == 0) {
     return true;
   }
-  for(AtomList::ConstIterator it = children.begin(); it != children.end(); ++it) {
-    if((*it)->name == name1) {
-      return (*it)->path(path, name2, name3);
+  for(unsigned int i = 0; i < children.size(); i++) {
+    if(children[i]->name == name1) {
+      return children[i]->path(path, name2, name3);
     }
   }
   return false;
@@ -152,8 +151,6 @@ MP4::Atom::path(MP4::AtomList &path, const char *name1, const char *name2, const
 
 MP4::Atoms::Atoms(File *file)
 {
-  atoms.setAutoDelete(true);
-
   file->seek(0, File::End);
   long end = file->tell();
   file->seek(0);
@@ -167,14 +164,18 @@ MP4::Atoms::Atoms(File *file)
 
 MP4::Atoms::~Atoms()
 {
+  for(unsigned int i = 0; i < atoms.size(); i++) {
+    delete atoms[i];
+  }
+  atoms.clear();
 }
 
 MP4::Atom *
 MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const char *name4)
 {
-  for(AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
-    if((*it)->name == name1) {
-      return (*it)->find(name2, name3, name4);
+  for(unsigned int i = 0; i < atoms.size(); i++) {
+    if(atoms[i]->name == name1) {
+      return atoms[i]->find(name2, name3, name4);
     }
   }
   return 0;
@@ -184,9 +185,9 @@ MP4::AtomList
 MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const char *name4)
 {
   MP4::AtomList path;
-  for(AtomList::ConstIterator it = atoms.begin(); it != atoms.end(); ++it) {
-    if((*it)->name == name1) {
-      if(!(*it)->path(path, name2, name3, name4)) {
+  for(unsigned int i = 0; i < atoms.size(); i++) {
+    if(atoms[i]->name == name1) {
+      if(!atoms[i]->path(path, name2, name3, name4)) {
         path.clear();
       }
       return path;
@@ -194,3 +195,4 @@ MP4::Atoms::path(const char *name1, const char *name2, const char *name3, const
   }
   return path;
 }
+

taglib/mp4/mp4atom.h

@@ -1,5 +1,5 @@
 /**************************************************************************
-    copyright            : (C) 2007,2011 by Lukáš Lalinský
+    copyright            : (C) 2007 by Lukáš Lalinský
     email                : lalinsky@gmail.com
  **************************************************************************/
 
@@ -40,66 +40,32 @@ namespace TagLib {
     class Atom;
     typedef TagLib::List<Atom *> AtomList;
 
-    enum AtomDataType
-    {
-      TypeImplicit  = 0,  // for use with tags for which no type needs to be indicated because only one type is allowed
-      TypeUTF8      = 1,  // without any count or null terminator
-      TypeUTF16     = 2,  // also known as UTF-16BE
-      TypeSJIS      = 3,  // deprecated unless it is needed for special Japanese characters
-      TypeHTML      = 6,  // the HTML file header specifies which HTML version
-      TypeXML       = 7,  // the XML header must identify the DTD or schemas
-      TypeUUID      = 8,  // also known as GUID; stored as 16 bytes in binary (valid as an ID)
-      TypeISRC      = 9,  // stored as UTF-8 text (valid as an ID)
-      TypeMI3P      = 10, // stored as UTF-8 text (valid as an ID)
-      TypeGIF       = 12, // (deprecated) a GIF image
-      TypeJPEG      = 13, // a JPEG image
-      TypePNG       = 14, // a PNG image
-      TypeURL       = 15, // absolute, in UTF-8 characters
-      TypeDuration  = 16, // in milliseconds, 32-bit integer
-      TypeDateTime  = 17, // in UTC, counting seconds since midnight, January 1, 1904; 32 or 64-bits
-      TypeGenred    = 18, // a list of enumerated values
-      TypeInteger   = 21, // a signed big-endian integer with length one of { 1,2,3,4,8 } bytes
-      TypeRIAAPA    = 24, // RIAA parental advisory; { -1=no, 1=yes, 0=unspecified }, 8-bit integer
-      TypeUPC       = 25, // Universal Product Code, in text UTF-8 format (valid as an ID)
-      TypeBMP       = 27, // Windows bitmap image
-      TypeUndefined = 255 // undefined
-    };
-
-    struct AtomData {
-      AtomData(AtomDataType type, ByteVector data) : type(type), locale(0), data(data) {}
-      AtomDataType type;
-      int locale;
-      ByteVector data;
-    };
-
-    typedef TagLib::List<AtomData> AtomDataList;
-
     class Atom
     {
     public:
-      Atom(File *file);
-      ~Atom();
-      Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
-      bool path(AtomList &path, const char *name1, const char *name2 = 0, const char *name3 = 0);
-      AtomList findall(const char *name, bool recursive = false);
-      long offset;
-      long length;
-      TagLib::ByteVector name;
-      AtomList children;
+        Atom(File *file);
+        ~Atom();
+        Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
+        bool path(AtomList &path, const char *name1, const char *name2 = 0, const char *name3 = 0);
+        AtomList findall(const char *name, bool recursive = false);
+        long offset;
+        long length;
+        TagLib::ByteVector name;
+        AtomList children;
     private:
-      static const int numContainers = 11;
-      static const char *containers[11];
+        static const int numContainers = 11;
+        static const char *containers[11];
     };
 
     //! Root-level atoms
     class Atoms
     {
     public:
-      Atoms(File *file);
-      ~Atoms();
-      Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
-      AtomList path(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
-      AtomList atoms;
+        Atoms(File *file);
+        ~Atoms();
+        Atom *find(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
+        AtomList path(const char *name1, const char *name2 = 0, const char *name3 = 0, const char *name4 = 0);
+        AtomList atoms;
     };
 
   }

taglib/mp4/mp4coverart.cpp

@@ -23,9 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
-#include "trefcounter.h"
 #include "mp4coverart.h"
 
 using namespace TagLib;
@@ -33,27 +36,20 @@ using namespace TagLib;
 class MP4::CoverArt::CoverArtPrivate : public RefCounter
 {
 public:
-  CoverArtPrivate() :
-    RefCounter(),
-    format(MP4::CoverArt::JPEG) {}
+  CoverArtPrivate() : RefCounter(), format(MP4::CoverArt::JPEG) {}
 
   Format format;
   ByteVector data;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MP4::CoverArt::CoverArt(Format format, const ByteVector &data) :
-  d(new CoverArtPrivate())
+MP4::CoverArt::CoverArt(Format format, const ByteVector &data)
 {
+  d = new CoverArtPrivate;
   d->format = format;
   d->data = data;
 }
 
-MP4::CoverArt::CoverArt(const CoverArt &item) :
-  d(item.d)
+MP4::CoverArt::CoverArt(const CoverArt &item) : d(item.d)
 {
   d->ref();
 }
@@ -61,18 +57,14 @@ MP4::CoverArt::CoverArt(const CoverArt &item) :
 MP4::CoverArt &
 MP4::CoverArt::operator=(const CoverArt &item)
 {
-  CoverArt(item).swap(*this);
+  if(d->deref()) {
+    delete d;
+  }
+  d = item.d;
+  d->ref();
   return *this;
 }
 
-void
-MP4::CoverArt::swap(CoverArt &item)
-{
-  using std::swap;
-
-  swap(d, item.d);
-}
-
 MP4::CoverArt::~CoverArt()
 {
   if(d->deref()) {
@@ -91,3 +83,4 @@ MP4::CoverArt::data() const
 {
   return d->data;
 }
+

taglib/mp4/mp4coverart.h

@@ -29,7 +29,6 @@
 #include "tlist.h"
 #include "tbytevector.h"
 #include "taglib_export.h"
-#include "mp4atom.h"
 
 namespace TagLib {
 
@@ -42,28 +41,16 @@ namespace TagLib {
        * This describes the image type.
        */
       enum Format {
-        JPEG    = TypeJPEG,
-        PNG     = TypePNG,
-        BMP     = TypeBMP,
-        GIF     = TypeGIF,
-        Unknown = TypeImplicit,
+        JPEG = 0x0D,
+        PNG  = 0x0E
       };
 
       CoverArt(Format format, const ByteVector &data);
       ~CoverArt();
 
       CoverArt(const CoverArt &item);
-
-      /*!
-       * Copies the contents of \a item into this CoverArt.
-       */
       CoverArt &operator=(const CoverArt &item);
 
-      /*!
-       * Exchanges the content of the CoverArt by the content of \a item.
-       */
-      void swap(CoverArt &item);
-
       //! Format of the image
       Format format() const;
 

taglib/mp4/mp4file.cpp

@@ -23,66 +23,58 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdebug.h>
 #include <tstring.h>
-#include <tpropertymap.h>
 #include "mp4atom.h"
 #include "mp4tag.h"
 #include "mp4file.h"
 
 using namespace TagLib;
 
-namespace
-{
-  bool checkValid(const MP4::AtomList &list)
-  {
-    for(MP4::AtomList::ConstIterator it = list.begin(); it != list.end(); ++it) {
-
-      if((*it)->length == 0)
-        return false;
-
-      if(!checkValid((*it)->children))
-        return false;
-    }
-
-    return true;
-  }
-}
-
 class MP4::File::FilePrivate
 {
 public:
-  FilePrivate() :
-    tag(0),
-    atoms(0),
-    properties(0) {}
+  FilePrivate() : tag(0), atoms(0), properties(0)
+  {
+  }
 
   ~FilePrivate()
   {
-    delete atoms;
-    delete tag;
-    delete properties;
+    if(atoms) {
+        delete atoms;
+        atoms = 0;
+    }
+    if(tag) {
+        delete tag;
+        tag = 0;
+    }
+    if(properties) {
+        delete properties;
+        properties = 0;
+    }
   }
 
-  MP4::Tag        *tag;
-  MP4::Atoms      *atoms;
+  MP4::Tag *tag;
+  MP4::Atoms *atoms;
   MP4::Properties *properties;
 };
 
-MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
+MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle audioPropertiesStyle)
+    : TagLib::File(file)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, audioPropertiesStyle);
 }
 
-MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate())
+MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle audioPropertiesStyle)
+    : TagLib::File(stream)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, audioPropertiesStyle);
 }
 
 MP4::File::~File()
@@ -96,48 +88,46 @@ MP4::File::tag() const
   return d->tag;
 }
 
-PropertyMap MP4::File::properties() const
-{
-  return d->tag->properties();
-}
-
-void MP4::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag->removeUnsupportedProperties(properties);
-}
-
-PropertyMap MP4::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag->setProperties(properties);
-}
-
 MP4::Properties *
 MP4::File::audioProperties() const
 {
   return d->properties;
 }
 
+bool
+MP4::File::checkValid(const MP4::AtomList &list)
+{
+  for(uint i = 0; i < list.size(); i++) {
+    if(list[i]->length == 0)
+      return false;
+    if(!checkValid(list[i]->children))
+      return false;
+  }
+  return true;
+}
+
 void
-MP4::File::read(bool readProperties)
+MP4::File::read(bool readProperties, Properties::ReadStyle audioPropertiesStyle)
 {
   if(!isValid())
     return;
 
   d->atoms = new Atoms(this);
-  if(!checkValid(d->atoms->atoms)) {
+  if (!checkValid(d->atoms->atoms)) {
     setValid(false);
     return;
   }
 
   // must have a moov atom, otherwise consider it invalid
-  if(!d->atoms->find("moov")) {
+  MP4::Atom *moov = d->atoms->find("moov");
+  if(!moov) {
     setValid(false);
     return;
   }
 
   d->tag = new Tag(this, d->atoms);
   if(readProperties) {
-    d->properties = new Properties(this, d->atoms);
+    d->properties = new Properties(this, d->atoms, audioPropertiesStyle);
   }
 }
 
@@ -157,8 +147,3 @@ MP4::File::save()
   return d->tag->save();
 }
 
-bool
-MP4::File::hasMP4Tag() const
-{
-  return (d->atoms->find("moov", "udta", "meta", "ilst") != 0);
-}

taglib/mp4/mp4file.h

@@ -49,25 +49,24 @@ namespace TagLib {
     {
     public:
       /*!
-       * Constructs an MP4 file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
+       * Contructs a MP4 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, \a propertiesStyle is ignored.
+       * \note In the current implementation, both \a readProperties and
+       * \a propertiesStyle are ignored.
        */
-      File(FileName file, bool readProperties = true,
-           Properties::ReadStyle audioPropertiesStyle = Properties::Average);
+      File(FileName file, bool readProperties = true, Properties::ReadStyle audioPropertiesStyle = Properties::Average);
 
       /*!
-       * Constructs an MP4 file from \a stream.  If \a readProperties is true the
-       * file's audio properties will also be read.
+       * Contructs a MP4 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 TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
-       *
-       * \note In the current implementation, \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 audioPropertiesStyle = Properties::Average);
+      File(IOStream *stream, bool readProperties = true, Properties::ReadStyle audioPropertiesStyle = Properties::Average);
 
       /*!
        * Destroys this instance of the File.
@@ -86,22 +85,6 @@ namespace TagLib {
        */
       Tag *tag() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       */
-      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.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the MP4 audio properties for this file.
        */
@@ -114,14 +97,10 @@ namespace TagLib {
        */
       bool save();
 
-      /*!
-       * Returns whether or not the file on disk actually has an MP4 tag, or the
-       * file has a Metadata Item List (ilst) atom.
-       */
-      bool hasMP4Tag() const;
-
     private:
-      void read(bool readProperties);
+
+      void read(bool readProperties, Properties::ReadStyle audioPropertiesStyle);
+      bool checkValid(const MP4::AtomList &list);
 
       class FilePrivate;
       FilePrivate *d;

taglib/mp4/mp4item.cpp

@@ -23,9 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <taglib.h>
 #include <tdebug.h>
-#include "trefcounter.h"
 #include "mp4item.h"
 
 using namespace TagLib;
@@ -33,34 +36,25 @@ using namespace TagLib;
 class MP4::Item::ItemPrivate : public RefCounter
 {
 public:
-  ItemPrivate() :
-    RefCounter(),
-    valid(true),
-    atomDataType(TypeUndefined) {}
+  ItemPrivate() : RefCounter(), valid(true) {}
 
   bool valid;
-  AtomDataType atomDataType;
   union {
     bool m_bool;
     int m_int;
     IntPair m_intPair;
-    unsigned char m_byte;
-    unsigned int m_uint;
-    long long m_longlong;
   };
   StringList m_stringList;
-  ByteVectorList m_byteVectorList;
   MP4::CoverArtList m_coverArtList;
 };
 
-MP4::Item::Item() :
-  d(new ItemPrivate())
+MP4::Item::Item()
 {
+  d = new ItemPrivate;
   d->valid = false;
 }
 
-MP4::Item::Item(const Item &item) :
-  d(item.d)
+MP4::Item::Item(const Item &item) : d(item.d)
 {
   d->ref();
 }
@@ -68,89 +62,52 @@ MP4::Item::Item(const Item &item) :
 MP4::Item &
 MP4::Item::operator=(const Item &item)
 {
-  Item(item).swap(*this);
+  if(d->deref()) {
+    delete d;
+  }
+  d = item.d;
+  d->ref();
   return *this;
 }
 
-void
-MP4::Item::swap(Item &item)
-{
-  using std::swap;
-
-  swap(d, item.d);
-}
-
 MP4::Item::~Item()
 {
-  if(d->deref())
+  if(d->deref()) {
     delete d;
+  }
 }
 
-MP4::Item::Item(bool value) :
-  d(new ItemPrivate())
+MP4::Item::Item(bool value)
 {
+  d = new ItemPrivate;
   d->m_bool = value;
 }
 
-MP4::Item::Item(int value) :
-  d(new ItemPrivate())
+MP4::Item::Item(int value)
 {
+  d = new ItemPrivate;
   d->m_int = value;
 }
 
-MP4::Item::Item(unsigned char value) :
-  d(new ItemPrivate())
-{
-  d->m_byte = value;
-}
-
-MP4::Item::Item(unsigned int value) :
-  d(new ItemPrivate())
-{
-  d->m_uint = value;
-}
-
-MP4::Item::Item(long long value) :
-  d(new ItemPrivate())
-{
-  d->m_longlong = value;
-}
-
-MP4::Item::Item(int value1, int value2) :
-  d(new ItemPrivate())
+MP4::Item::Item(int value1, int value2)
 {
+  d = new ItemPrivate;
   d->m_intPair.first = value1;
   d->m_intPair.second = value2;
 }
 
-MP4::Item::Item(const ByteVectorList &value) :
-  d(new ItemPrivate())
-{
-  d->m_byteVectorList = value;
-}
-
-MP4::Item::Item(const StringList &value) :
-  d(new ItemPrivate())
+MP4::Item::Item(const StringList &value)
 {
+  d = new ItemPrivate;
   d->m_stringList = value;
 }
 
-MP4::Item::Item(const MP4::CoverArtList &value) :
-  d(new ItemPrivate())
+MP4::Item::Item(const MP4::CoverArtList &value)
 {
+  d = new ItemPrivate;
   d->m_coverArtList = value;
 }
 
-void MP4::Item::setAtomDataType(MP4::AtomDataType type)
-{
-  d->atomDataType = type;
-}
-
-MP4::AtomDataType MP4::Item::atomDataType() const
-{
-  return d->atomDataType;
-}
-
 bool
 MP4::Item::toBool() const
 {
@@ -163,24 +120,6 @@ MP4::Item::toInt() const
   return d->m_int;
 }
 
-unsigned char
-MP4::Item::toByte() const
-{
-  return d->m_byte;
-}
-
-unsigned int
-MP4::Item::toUInt() const
-{
-  return d->m_uint;
-}
-
-long long
-MP4::Item::toLongLong() const
-{
-  return d->m_longlong;
-}
-
 MP4::Item::IntPair
 MP4::Item::toIntPair() const
 {
@@ -193,12 +132,6 @@ MP4::Item::toStringList() const
   return d->m_stringList;
 }
 
-ByteVectorList
-MP4::Item::toByteVectorList() const
-{
-  return d->m_byteVectorList;
-}
-
 MP4::CoverArtList
 MP4::Item::toCoverArtList() const
 {
@@ -210,3 +143,4 @@ MP4::Item::isValid() const
 {
   return d->valid;
 }
+

taglib/mp4/mp4item.h

@@ -43,40 +43,19 @@ namespace TagLib {
 
       Item();
       Item(const Item &item);
-
-      /*!
-       * Copies the contents of \a item into this Item.
-       */
       Item &operator=(const Item &item);
-
-      /*!
-       * Exchanges the content of the Item by the content of \a item.
-       */
-      void swap(Item &item);
-
       ~Item();
 
       Item(int value);
-      Item(unsigned char value);
-      Item(unsigned int value);
-      Item(long long value);
       Item(bool value);
       Item(int first, int second);
       Item(const StringList &value);
-      Item(const ByteVectorList &value);
       Item(const CoverArtList &value);
 
-      void setAtomDataType(AtomDataType type);
-      AtomDataType atomDataType() const;
-
       int toInt() const;
-      unsigned char toByte() const;
-      unsigned int toUInt() const;
-      long long toLongLong() const;
       bool toBool() const;
       IntPair toIntPair() const;
       StringList toStringList() const;
-      ByteVectorList toByteVectorList() const;
       CoverArtList toCoverArtList() const;
 
       bool isValid() const;

taglib/mp4/mp4properties.cpp

@@ -23,6 +23,10 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdebug.h>
 #include <tstring.h>
 #include "mp4file.h"
@@ -34,14 +38,7 @@ using namespace TagLib;
 class MP4::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate() :
-    length(0),
-    bitrate(0),
-    sampleRate(0),
-    channels(0),
-    bitsPerSample(0),
-    encrypted(false),
-    codec(MP4::Properties::Unknown) {}
+  PropertiesPrivate() : length(0), bitrate(0), sampleRate(0), channels(0), bitsPerSample(0), encrypted(false) {}
 
   int length;
   int bitrate;
@@ -49,18 +46,101 @@ public:
   int channels;
   int bitsPerSample;
   bool encrypted;
-  Codec codec;
 };
 
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-MP4::Properties::Properties(File *file, MP4::Atoms *atoms, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
+MP4::Properties::Properties(File *file, MP4::Atoms *atoms, ReadStyle style)
+  : AudioProperties(style)
 {
-  read(file, atoms);
+  d = new PropertiesPrivate;
+
+  MP4::Atom *moov = atoms->find("moov");
+  if(!moov) {
+    debug("MP4: Atom 'moov' not found");
+    return;
+  }
+
+  MP4::Atom *trak = 0;
+  ByteVector data;
+
+  MP4::AtomList trakList = moov->findall("trak");
+  for (unsigned int i = 0; i < trakList.size(); i++) {
+    trak = trakList[i];
+    MP4::Atom *hdlr = trak->find("mdia", "hdlr");
+    if(!hdlr) {
+      debug("MP4: Atom 'trak.mdia.hdlr' not found");
+      return;
+    }
+    file->seek(hdlr->offset);
+    data = file->readBlock(hdlr->length);
+    if(data.mid(16, 4) == "soun") {
+      break;
+    }
+    trak = 0;
+  }
+  if (!trak) {
+    debug("MP4: No audio tracks");
+    return;
+  }
+
+  MP4::Atom *mdhd = trak->find("mdia", "mdhd");
+  if(!mdhd) {
+    debug("MP4: Atom 'trak.mdia.mdhd' not found");
+    return;
+  }
+
+  file->seek(mdhd->offset);
+  data = file->readBlock(mdhd->length);
+  if(data[8] == 0) {
+    unsigned int unit = data.mid(20, 4).toUInt();
+    unsigned int length = data.mid(24, 4).toUInt();
+    d->length = length / unit;
+  }
+  else {
+    long long unit = data.mid(28, 8).toLongLong();
+    long long length = data.mid(36, 8).toLongLong();
+    d->length = int(length / unit);
+  }
+
+  MP4::Atom *atom = trak->find("mdia", "minf", "stbl", "stsd");
+  if(!atom) {
+    return;
+  }
+
+  file->seek(atom->offset);
+  data = file->readBlock(atom->length);
+  if(data.mid(20, 4) == "mp4a") {
+    d->channels = data.mid(40, 2).toShort();
+    d->bitsPerSample = data.mid(42, 2).toShort();
+    d->sampleRate = data.mid(46, 4).toUInt();
+    if(data.mid(56, 4) == "esds" && data[64] == 0x03) {
+      long pos = 65;
+      if(data.mid(pos, 3) == "\x80\x80\x80") {
+        pos += 3;
+      }
+      pos += 4;
+      if(data[pos] == 0x04) {
+        pos += 1;
+        if(data.mid(pos, 3) == "\x80\x80\x80") {
+          pos += 3;
+        }
+        pos += 10;
+        d->bitrate = (data.mid(pos, 4).toUInt() + 500) / 1000;
+      }
+    }
+  }
+  else if (data.mid(20, 4) == "alac") {
+    if (atom->length == 88 && data.mid(56, 4) == "alac") {
+      d->bitsPerSample = data.at(69);
+      d->channels = data.at(73);
+      d->bitrate = data.mid(80, 4).toUInt() / 1000;
+      d->sampleRate = data.mid(84, 4).toUInt();
+    }
+  }
+
+  MP4::Atom *drms = atom->find("drms");
+  if(drms) {
+    d->encrypted = true;
+  }
 }
 
 MP4::Properties::~Properties()
@@ -82,18 +162,6 @@ MP4::Properties::sampleRate() const
 
 int
 MP4::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int
-MP4::Properties::lengthInSeconds() const
-{
-  return d->length / 1000;
-}
-
-int
-MP4::Properties::lengthInMilliseconds() const
 {
   return d->length;
 }
@@ -116,119 +184,3 @@ MP4::Properties::isEncrypted() const
   return d->encrypted;
 }
 
-MP4::Properties::Codec
-MP4::Properties::codec() const
-{
-  return d->codec;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-void
-MP4::Properties::read(File *file, Atoms *atoms)
-{
-  MP4::Atom *moov = atoms->find("moov");
-  if(!moov) {
-    debug("MP4: Atom 'moov' not found");
-    return;
-  }
-
-  MP4::Atom *trak = 0;
-  ByteVector data;
-
-  const MP4::AtomList trakList = moov->findall("trak");
-  for(MP4::AtomList::ConstIterator it = trakList.begin(); it != trakList.end(); ++it) {
-    trak = *it;
-    MP4::Atom *hdlr = trak->find("mdia", "hdlr");
-    if(!hdlr) {
-      debug("MP4: Atom 'trak.mdia.hdlr' not found");
-      return;
-    }
-    file->seek(hdlr->offset);
-    data = file->readBlock(hdlr->length);
-    if(data.containsAt("soun", 16)) {
-      break;
-    }
-    trak = 0;
-  }
-  if(!trak) {
-    debug("MP4: No audio tracks");
-    return;
-  }
-
-  MP4::Atom *mdhd = trak->find("mdia", "mdhd");
-  if(!mdhd) {
-    debug("MP4: Atom 'trak.mdia.mdhd' not found");
-    return;
-  }
-
-  file->seek(mdhd->offset);
-  data = file->readBlock(mdhd->length);
-
-  const unsigned int version = data[8];
-  long long unit;
-  long long length;
-  if(version == 1) {
-    if(data.size() < 36 + 8) {
-      debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
-      return;
-    }
-    unit   = data.toLongLong(28U);
-    length = data.toLongLong(36U);
-  }
-  else {
-    if(data.size() < 24 + 4) {
-      debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
-      return;
-    }
-    unit   = data.toUInt(20U);
-    length = data.toUInt(24U);
-  }
-  if(unit > 0 && length > 0)
-    d->length = static_cast<int>(length * 1000.0 / unit + 0.5);
-
-  MP4::Atom *atom = trak->find("mdia", "minf", "stbl", "stsd");
-  if(!atom) {
-    return;
-  }
-
-  file->seek(atom->offset);
-  data = file->readBlock(atom->length);
-  if(data.containsAt("mp4a", 20)) {
-    d->codec         = AAC;
-    d->channels      = data.toShort(40U);
-    d->bitsPerSample = data.toShort(42U);
-    d->sampleRate    = data.toUInt(46U);
-    if(data.containsAt("esds", 56) && data[64] == 0x03) {
-      unsigned int pos = 65;
-      if(data.containsAt("\x80\x80\x80", pos)) {
-        pos += 3;
-      }
-      pos += 4;
-      if(data[pos] == 0x04) {
-        pos += 1;
-        if(data.containsAt("\x80\x80\x80", pos)) {
-          pos += 3;
-        }
-        pos += 10;
-        d->bitrate = static_cast<int>((data.toUInt(pos) + 500) / 1000.0 + 0.5);
-      }
-    }
-  }
-  else if(data.containsAt("alac", 20)) {
-    if(atom->length == 88 && data.containsAt("alac", 56)) {
-      d->codec         = ALAC;
-      d->bitsPerSample = data.at(69);
-      d->channels      = data.at(73);
-      d->bitrate       = static_cast<int>(data.toUInt(80U) / 1000.0 + 0.5);
-      d->sampleRate    = data.toUInt(84U);
-    }
-  }
-
-  MP4::Atom *drms = atom->find("drms");
-  if(drms) {
-    d->encrypted = true;
-  }
-}

taglib/mp4/mp4properties.h

@@ -40,75 +40,17 @@ namespace TagLib {
     class TAGLIB_EXPORT Properties : public AudioProperties
     {
     public:
-      enum Codec {
-        Unknown = 0,
-        AAC,
-        ALAC
-      };
-
       Properties(File *file, Atoms *atoms, ReadStyle style = Average);
       virtual ~Properties();
 
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
       virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \see lengthInMilliseconds()
-       */
-      // BIC: make virtual
-      int lengthInSeconds() const;
-
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
-
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
       virtual int bitrate() const;
-
-      /*!
-       * Returns the sample rate in Hz.
-       */
       virtual int sampleRate() const;
-
-      /*!
-       * Returns the number of audio channels.
-       */
       virtual int channels() const;
-
-      /*!
-       * Returns the number of bits per audio sample.
-       */
       virtual int bitsPerSample() const;
-
-      /*!
-       * Returns whether or not the file is encrypted.
-       */
       bool isEncrypted() const;
 
-      /*!
-       * Returns the codec used in the file.
-       */
-      Codec codec() const;
-
     private:
-      void read(File *file, Atoms *atoms);
-
       class PropertiesPrivate;
       PropertiesPrivate *d;
     };

taglib/mp4/mp4tag.cpp

@@ -1,5 +1,5 @@
 /**************************************************************************
-    copyright            : (C) 2007,2011 by Lukáš Lalinský
+    copyright            : (C) 2007 by Lukáš Lalinský
     email                : lalinsky@gmail.com
  **************************************************************************/
 
@@ -23,9 +23,12 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <tdebug.h>
 #include <tstring.h>
-#include <tpropertymap.h>
 #include "mp4atom.h"
 #include "mp4tag.h"
 #include "id3v1genres.h"
@@ -35,23 +38,21 @@ using namespace TagLib;
 class MP4::Tag::TagPrivate
 {
 public:
-  TagPrivate() :
-    file(0),
-    atoms(0) {}
-
+  TagPrivate() : file(0), atoms(0) {}
+  ~TagPrivate() {}
   TagLib::File *file;
   Atoms *atoms;
-  ItemMap items;
+  ItemListMap items;
 };
 
-MP4::Tag::Tag() :
-  d(new TagPrivate())
+MP4::Tag::Tag()
 {
+  d = new TagPrivate;
 }
 
-MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms) :
-  d(new TagPrivate())
+MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms)
 {
+  d = new TagPrivate;
   d->file = file;
   d->atoms = atoms;
 
@@ -61,40 +62,29 @@ MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms) :
     return;
   }
 
-  for(AtomList::ConstIterator it = ilst->children.begin(); it != ilst->children.end(); ++it) {
-    MP4::Atom *atom = *it;
+  for(unsigned int i = 0; i < ilst->children.size(); i++) {
+    MP4::Atom *atom = ilst->children[i];
     file->seek(atom->offset + 8);
     if(atom->name == "----") {
-      parseFreeForm(atom);
+      parseFreeForm(atom, file);
     }
     else if(atom->name == "trkn" || atom->name == "disk") {
-      parseIntPair(atom);
+      parseIntPair(atom, file);
     }
-    else if(atom->name == "cpil" || atom->name == "pgap" || atom->name == "pcst" ||
-            atom->name == "hdvd") {
-      parseBool(atom);
+    else if(atom->name == "cpil" || atom->name == "pgap" || atom->name == "pcst") {
+      parseBool(atom, file);
     }
     else if(atom->name == "tmpo") {
-      parseInt(atom);
-    }
-    else if(atom->name == "tvsn" || atom->name == "tves" || atom->name == "cnID" ||
-            atom->name == "sfID" || atom->name == "atID" || atom->name == "geID") {
-      parseUInt(atom);
-    }
-    else if(atom->name == "plID") {
-      parseLongLong(atom);
-    }
-    else if(atom->name == "stik" || atom->name == "rtng" || atom->name == "akID") {
-      parseByte(atom);
+      parseInt(atom, file);
     }
     else if(atom->name == "gnre") {
-      parseGnre(atom);
+      parseGnre(atom, file);
     }
     else if(atom->name == "covr") {
-      parseCovr(atom);
+      parseCovr(atom, file);
     }
     else {
-      parseText(atom);
+      parseText(atom, file);
     }
   }
 }
@@ -104,22 +94,17 @@ MP4::Tag::~Tag()
   delete d;
 }
 
-MP4::AtomDataList
-MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm)
+ByteVectorList
+MP4::Tag::parseData(MP4::Atom *atom, TagLib::File *file, int expectedFlags, bool freeForm)
 {
-  AtomDataList result;
-  ByteVector data = d->file->readBlock(atom->length - 8);
+  ByteVectorList result;
+  ByteVector data = file->readBlock(atom->length - 8);
   int i = 0;
   unsigned int pos = 0;
   while(pos < data.size()) {
-    const int length = static_cast<int>(data.toUInt(pos));
-    if(length < 12) {
-      debug("MP4: Too short atom");
-      return result;
-    }
-
-    const ByteVector name = data.mid(pos + 4, 4);
-    const int flags = static_cast<int>(data.toUInt(pos + 8));
+    int length = data.mid(pos, 4).toUInt();
+    ByteVector name = data.mid(pos + 4, 4);
+    int flags = data.mid(pos + 8, 4).toUInt();
     if(freeForm && i < 2) {
       if(i == 0 && name != "mean") {
         debug("MP4: Unexpected atom \"" + name + "\", expecting \"mean\"");
@@ -129,7 +114,7 @@ MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm)
         debug("MP4: Unexpected atom \"" + name + "\", expecting \"name\"");
         return result;
       }
-      result.append(AtomData(AtomDataType(flags), data.mid(pos + 12, length - 12)));
+      result.append(data.mid(pos + 12, length - 12));
     }
     else {
       if(name != "data") {
@@ -137,7 +122,7 @@ MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm)
         return result;
       }
       if(expectedFlags == -1 || flags == expectedFlags) {
-        result.append(AtomData(AtomDataType(flags), data.mid(pos + 16, length - 16)));
+        result.append(data.mid(pos + 16, length - 16));
       }
     }
     pos += length;
@@ -146,313 +131,198 @@ MP4::Tag::parseData2(const MP4::Atom *atom, int expectedFlags, bool freeForm)
   return result;
 }
 
-ByteVectorList
-MP4::Tag::parseData(const MP4::Atom *atom, int expectedFlags, bool freeForm)
-{
-  AtomDataList data = parseData2(atom, expectedFlags, freeForm);
-  ByteVectorList result;
-  for(AtomDataList::ConstIterator it = data.begin(); it != data.end(); ++it) {
-    result.append(it->data);
-  }
-  return result;
-}
-
 void
-MP4::Tag::parseInt(const MP4::Atom *atom)
+MP4::Tag::parseInt(MP4::Atom *atom, TagLib::File *file)
 {
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
-    addItem(atom->name, (int)data[0].toShort());
+  ByteVectorList data = parseData(atom, file);
+  if(data.size()) {
+    d->items.insert(atom->name, (int)data[0].toShort());
   }
 }
 
 void
-MP4::Tag::parseUInt(const MP4::Atom *atom)
+MP4::Tag::parseGnre(MP4::Atom *atom, TagLib::File *file)
 {
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
-    addItem(atom->name, data[0].toUInt());
-  }
-}
-
-void
-MP4::Tag::parseLongLong(const MP4::Atom *atom)
-{
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
-    addItem(atom->name, data[0].toLongLong());
-  }
-}
-
-void
-MP4::Tag::parseByte(const MP4::Atom *atom)
-{
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
-    addItem(atom->name, static_cast<unsigned char>(data[0].at(0)));
-  }
-}
-
-void
-MP4::Tag::parseGnre(const MP4::Atom *atom)
-{
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
+  ByteVectorList data = parseData(atom, file);
+  if(data.size()) {
     int idx = (int)data[0].toShort();
-    if(idx > 0) {
-      addItem("\251gen", StringList(ID3v1::genre(idx - 1)));
+    if(!d->items.contains("\251gen") && idx > 0) {
+      d->items.insert("\251gen", StringList(ID3v1::genre(idx - 1)));
     }
   }
 }
 
 void
-MP4::Tag::parseIntPair(const MP4::Atom *atom)
+MP4::Tag::parseIntPair(MP4::Atom *atom, TagLib::File *file)
 {
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
-    const int a = data[0].toShort(2U);
-    const int b = data[0].toShort(4U);
-    addItem(atom->name, MP4::Item(a, b));
+  ByteVectorList data = parseData(atom, file);
+  if(data.size()) {
+    int a = data[0].mid(2, 2).toShort();
+    int b = data[0].mid(4, 2).toShort();
+    d->items.insert(atom->name, MP4::Item(a, b));
   }
 }
 
 void
-MP4::Tag::parseBool(const MP4::Atom *atom)
+MP4::Tag::parseBool(MP4::Atom *atom, TagLib::File *file)
 {
-  ByteVectorList data = parseData(atom);
-  if(!data.isEmpty()) {
+  ByteVectorList data = parseData(atom, file);
+  if(data.size()) {
     bool value = data[0].size() ? data[0][0] != '\0' : false;
-    addItem(atom->name, value);
+    d->items.insert(atom->name, value);
   }
 }
 
 void
-MP4::Tag::parseText(const MP4::Atom *atom, int expectedFlags)
+MP4::Tag::parseText(MP4::Atom *atom, TagLib::File *file, int expectedFlags)
 {
-  ByteVectorList data = parseData(atom, expectedFlags);
-  if(!data.isEmpty()) {
+  ByteVectorList data = parseData(atom, file, expectedFlags);
+  if(data.size()) {
     StringList value;
-    for(ByteVectorList::ConstIterator it = data.begin(); it != data.end(); ++it) {
-      value.append(String(*it, String::UTF8));
+    for(unsigned int i = 0; i < data.size(); i++) {
+      value.append(String(data[i], String::UTF8));
     }
-    addItem(atom->name, value);
+    d->items.insert(atom->name, value);
   }
 }
 
 void
-MP4::Tag::parseFreeForm(const MP4::Atom *atom)
+MP4::Tag::parseFreeForm(MP4::Atom *atom, TagLib::File *file)
 {
-  AtomDataList data = parseData2(atom, -1, true);
+  ByteVectorList data = parseData(atom, file, 1, true);
   if(data.size() > 2) {
-    AtomDataList::ConstIterator itBegin = data.begin();
-
-    String name = "----:";
-    name += String((itBegin++)->data, String::UTF8);  // data[0].data
-    name += ':';
-    name += String((itBegin++)->data, String::UTF8);  // data[1].data
-
-    AtomDataType type = itBegin->type; // data[2].type
-
-    for(AtomDataList::ConstIterator it = itBegin; it != data.end(); ++it) {
-      if(it->type != type) {
-        debug("MP4: We currently don't support values with multiple types");
-        break;
-      }
-    }
-    if(type == TypeUTF8) {
-      StringList value;
-      for(AtomDataList::ConstIterator it = itBegin; it != data.end(); ++it) {
-        value.append(String(it->data, String::UTF8));
-      }
-      Item item(value);
-      item.setAtomDataType(type);
-      addItem(name, item);
-    }
-    else {
-      ByteVectorList value;
-      for(AtomDataList::ConstIterator it = itBegin; it != data.end(); ++it) {
-        value.append(it->data);
-      }
-      Item item(value);
-      item.setAtomDataType(type);
-      addItem(name, item);
+    StringList value;
+    for(unsigned int i = 2; i < data.size(); i++) {
+      value.append(String(data[i], String::UTF8));
     }
+    String name = "----:" + data[0] + ':' + data[1];
+    d->items.insert(name, value);
   }
 }
 
 void
-MP4::Tag::parseCovr(const MP4::Atom *atom)
+MP4::Tag::parseCovr(MP4::Atom *atom, TagLib::File *file)
 {
   MP4::CoverArtList value;
-  ByteVector data = d->file->readBlock(atom->length - 8);
+  ByteVector data = file->readBlock(atom->length - 8);
   unsigned int pos = 0;
   while(pos < data.size()) {
-    const int length = static_cast<int>(data.toUInt(pos));
-    if(length < 12) {
-      debug("MP4: Too short atom");
-      break;;
-    }
-
-    const ByteVector name = data.mid(pos + 4, 4);
-    const int flags = static_cast<int>(data.toUInt(pos + 8));
+    int length = data.mid(pos, 4).toUInt();
+    ByteVector name = data.mid(pos + 4, 4);
+    int flags = data.mid(pos + 8, 4).toUInt();
     if(name != "data") {
       debug("MP4: Unexpected atom \"" + name + "\", expecting \"data\"");
       break;
     }
-    if(flags == TypeJPEG || flags == TypePNG || flags == TypeBMP ||
-       flags == TypeGIF || flags == TypeImplicit) {
+    if(flags == MP4::CoverArt::PNG || flags == MP4::CoverArt::JPEG) {
       value.append(MP4::CoverArt(MP4::CoverArt::Format(flags),
                                  data.mid(pos + 16, length - 16)));
     }
-    else {
-      debug("MP4: Unknown covr format " + String::number(flags));
-    }
     pos += length;
   }
-  if(!value.isEmpty())
-    addItem(atom->name, value);
+  if(value.size() > 0)
+    d->items.insert(atom->name, value);
 }
 
 ByteVector
-MP4::Tag::padIlst(const ByteVector &data, int length) const
+MP4::Tag::padIlst(const ByteVector &data, int length)
 {
-  if(length == -1) {
+  if (length == -1) {
     length = ((data.size() + 1023) & ~1023) - data.size();
   }
   return renderAtom("free", ByteVector(length, '\1'));
 }
 
 ByteVector
-MP4::Tag::renderAtom(const ByteVector &name, const ByteVector &data) const
+MP4::Tag::renderAtom(const ByteVector &name, const ByteVector &data)
 {
   return ByteVector::fromUInt(data.size() + 8) + name + data;
 }
 
 ByteVector
-MP4::Tag::renderData(const ByteVector &name, int flags, const ByteVectorList &data) const
+MP4::Tag::renderData(const ByteVector &name, int flags, const ByteVectorList &data)
 {
   ByteVector result;
-  for(ByteVectorList::ConstIterator it = data.begin(); it != data.end(); ++it) {
-    result.append(renderAtom("data", ByteVector::fromUInt(flags) + ByteVector(4, '\0') + *it));
+  for(unsigned int i = 0; i < data.size(); i++) {
+    result.append(renderAtom("data", ByteVector::fromUInt(flags) + ByteVector(4, '\0') + data[i]));
   }
   return renderAtom(name, result);
 }
 
 ByteVector
-MP4::Tag::renderBool(const ByteVector &name, const MP4::Item &item) const
+MP4::Tag::renderBool(const ByteVector &name, MP4::Item &item)
 {
   ByteVectorList data;
   data.append(ByteVector(1, item.toBool() ? '\1' : '\0'));
-  return renderData(name, TypeInteger, data);
+  return renderData(name, 0x15, data);
 }
 
 ByteVector
-MP4::Tag::renderInt(const ByteVector &name, const MP4::Item &item) const
+MP4::Tag::renderInt(const ByteVector &name, MP4::Item &item)
 {
   ByteVectorList data;
   data.append(ByteVector::fromShort(item.toInt()));
-  return renderData(name, TypeInteger, data);
+  return renderData(name, 0x15, data);
 }
 
 ByteVector
-MP4::Tag::renderUInt(const ByteVector &name, const MP4::Item &item) const
-{
-  ByteVectorList data;
-  data.append(ByteVector::fromUInt(item.toUInt()));
-  return renderData(name, TypeInteger, data);
-}
-
-ByteVector
-MP4::Tag::renderLongLong(const ByteVector &name, const MP4::Item &item) const
-{
-  ByteVectorList data;
-  data.append(ByteVector::fromLongLong(item.toLongLong()));
-  return renderData(name, TypeInteger, data);
-}
-
-ByteVector
-MP4::Tag::renderByte(const ByteVector &name, const MP4::Item &item) const
-{
-  ByteVectorList data;
-  data.append(ByteVector(1, item.toByte()));
-  return renderData(name, TypeInteger, data);
-}
-
-ByteVector
-MP4::Tag::renderIntPair(const ByteVector &name, const MP4::Item &item) const
+MP4::Tag::renderIntPair(const ByteVector &name, MP4::Item &item)
 {
   ByteVectorList data;
   data.append(ByteVector(2, '\0') +
               ByteVector::fromShort(item.toIntPair().first) +
               ByteVector::fromShort(item.toIntPair().second) +
               ByteVector(2, '\0'));
-  return renderData(name, TypeImplicit, data);
+  return renderData(name, 0x00, data);
 }
 
 ByteVector
-MP4::Tag::renderIntPairNoTrailing(const ByteVector &name, const MP4::Item &item) const
+MP4::Tag::renderIntPairNoTrailing(const ByteVector &name, MP4::Item &item)
 {
   ByteVectorList data;
   data.append(ByteVector(2, '\0') +
               ByteVector::fromShort(item.toIntPair().first) +
               ByteVector::fromShort(item.toIntPair().second));
-  return renderData(name, TypeImplicit, data);
+  return renderData(name, 0x00, data);
 }
 
 ByteVector
-MP4::Tag::renderText(const ByteVector &name, const MP4::Item &item, int flags) const
+MP4::Tag::renderText(const ByteVector &name, MP4::Item &item, int flags)
 {
   ByteVectorList data;
   StringList value = item.toStringList();
-  for(StringList::ConstIterator it = value.begin(); it != value.end(); ++it) {
-    data.append(it->data(String::UTF8));
+  for(unsigned int i = 0; i < value.size(); i++) {
+    data.append(value[i].data(String::UTF8));
   }
   return renderData(name, flags, data);
 }
 
 ByteVector
-MP4::Tag::renderCovr(const ByteVector &name, const MP4::Item &item) const
+MP4::Tag::renderCovr(const ByteVector &name, MP4::Item &item)
 {
   ByteVector data;
   MP4::CoverArtList value = item.toCoverArtList();
-  for(MP4::CoverArtList::ConstIterator it = value.begin(); it != value.end(); ++it) {
-    data.append(renderAtom("data", ByteVector::fromUInt(it->format()) +
-                                   ByteVector(4, '\0') + it->data()));
+  for(unsigned int i = 0; i < value.size(); i++) {
+    data.append(renderAtom("data", ByteVector::fromUInt(value[i].format()) +
+                                   ByteVector(4, '\0') + value[i].data()));
   }
   return renderAtom(name, data);
 }
 
 ByteVector
-MP4::Tag::renderFreeForm(const String &name, const MP4::Item &item) const
+MP4::Tag::renderFreeForm(const String &name, MP4::Item &item)
 {
   StringList header = StringList::split(name, ":");
-  if(header.size() != 3) {
+  if (header.size() != 3) {
     debug("MP4: Invalid free-form item name \"" + name + "\"");
-    return ByteVector();
+    return ByteVector::null;
   }
   ByteVector data;
   data.append(renderAtom("mean", ByteVector::fromUInt(0) + header[1].data(String::UTF8)));
   data.append(renderAtom("name", ByteVector::fromUInt(0) + header[2].data(String::UTF8)));
-  AtomDataType type = item.atomDataType();
-  if(type == TypeUndefined) {
-    if(!item.toStringList().isEmpty()) {
-      type = TypeUTF8;
-    }
-    else {
-      type = TypeImplicit;
-    }
-  }
-  if(type == TypeUTF8) {
-    StringList value = item.toStringList();
-    for(StringList::ConstIterator it = value.begin(); it != value.end(); ++it) {
-      data.append(renderAtom("data", ByteVector::fromUInt(type) + ByteVector(4, '\0') + it->data(String::UTF8)));
-    }
-  }
-  else {
-    ByteVectorList value = item.toByteVectorList();
-    for(ByteVectorList::ConstIterator it = value.begin(); it != value.end(); ++it) {
-      data.append(renderAtom("data", ByteVector::fromUInt(type) + ByteVector(4, '\0') + *it));
-    }
+  StringList value = item.toStringList();
+  for(unsigned int i = 0; i < value.size(); i++) {
+    data.append(renderAtom("data", ByteVector::fromUInt(1) + ByteVector(4, '\0') + value[i].data(String::UTF8)));
   }
   return renderAtom("----", data);
 }
@@ -461,38 +331,28 @@ bool
 MP4::Tag::save()
 {
   ByteVector data;
-  for(MP4::ItemMap::ConstIterator it = d->items.begin(); it != d->items.end(); ++it) {
-    const String name = it->first;
+  for(MP4::ItemListMap::Iterator i = d->items.begin(); i != d->items.end(); i++) {
+    const String name = i->first;
     if(name.startsWith("----")) {
-      data.append(renderFreeForm(name, it->second));
+      data.append(renderFreeForm(name, i->second));
     }
     else if(name == "trkn") {
-      data.append(renderIntPair(name.data(String::Latin1), it->second));
+      data.append(renderIntPair(name.data(String::Latin1), i->second));
     }
     else if(name == "disk") {
-      data.append(renderIntPairNoTrailing(name.data(String::Latin1), it->second));
+      data.append(renderIntPairNoTrailing(name.data(String::Latin1), i->second));
     }
-    else if(name == "cpil" || name == "pgap" || name == "pcst" || name == "hdvd") {
-      data.append(renderBool(name.data(String::Latin1), it->second));
+    else if(name == "cpil" || name == "pgap" || name == "pcst") {
+      data.append(renderBool(name.data(String::Latin1), i->second));
     }
     else if(name == "tmpo") {
-      data.append(renderInt(name.data(String::Latin1), it->second));
-    }
-    else if(name == "tvsn" || name == "tves" || name == "cnID" ||
-            name == "sfID" || name == "atID" || name == "geID") {
-      data.append(renderUInt(name.data(String::Latin1), it->second));
-    }
-    else if(name == "plID") {
-      data.append(renderLongLong(name.data(String::Latin1), it->second));
-    }
-    else if(name == "stik" || name == "rtng" || name == "akID") {
-      data.append(renderByte(name.data(String::Latin1), it->second));
+      data.append(renderInt(name.data(String::Latin1), i->second));
     }
     else if(name == "covr") {
-      data.append(renderCovr(name.data(String::Latin1), it->second));
+      data.append(renderCovr(name.data(String::Latin1), i->second));
     }
     else if(name.size() == 4){
-      data.append(renderText(name.data(String::Latin1), it->second));
+      data.append(renderText(name.data(String::Latin1), i->second));
     }
     else {
       debug("MP4: Unknown item name \"" + name + "\"");
@@ -512,28 +372,22 @@ MP4::Tag::save()
 }
 
 void
-MP4::Tag::updateParents(const AtomList &path, long delta, int ignore)
+MP4::Tag::updateParents(AtomList &path, long delta, int ignore)
 {
-  if(static_cast<int>(path.size()) <= ignore)
-    return;
-
-  AtomList::ConstIterator itEnd = path.end();
-  std::advance(itEnd, 0 - ignore);
-
-  for(AtomList::ConstIterator it = path.begin(); it != itEnd; ++it) {
-    d->file->seek((*it)->offset);
+  for(unsigned int i = 0; i < path.size() - ignore; i++) {
+    d->file->seek(path[i]->offset);
     long size = d->file->readBlock(4).toUInt();
     // 64-bit
     if (size == 1) {
       d->file->seek(4, File::Current); // Skip name
       long long longSize = d->file->readBlock(8).toLongLong();
       // Seek the offset of the 64-bit size
-      d->file->seek((*it)->offset + 8);
+      d->file->seek(path[i]->offset + 8);
       d->file->writeBlock(ByteVector::fromLongLong(longSize + delta));
     }
     // 32-bit
     else {
-      d->file->seek((*it)->offset);
+      d->file->seek(path[i]->offset);
       d->file->writeBlock(ByteVector::fromUInt(size + delta));
     }
   }
@@ -545,18 +399,18 @@ MP4::Tag::updateOffsets(long delta, long offset)
   MP4::Atom *moov = d->atoms->find("moov");
   if(moov) {
     MP4::AtomList stco = moov->findall("stco", true);
-    for(MP4::AtomList::ConstIterator it = stco.begin(); it != stco.end(); ++it) {
-      MP4::Atom *atom = *it;
+    for(unsigned int i = 0; i < stco.size(); i++) {
+      MP4::Atom *atom = stco[i];
       if(atom->offset > offset) {
         atom->offset += delta;
       }
       d->file->seek(atom->offset + 12);
       ByteVector data = d->file->readBlock(atom->length - 12);
-      unsigned int count = data.toUInt();
+      unsigned int count = data.mid(0, 4).toUInt();
       d->file->seek(atom->offset + 16);
-      unsigned int pos = 4;
+      int pos = 4;
       while(count--) {
-        long o = static_cast<long>(data.toUInt(pos));
+        long o = data.mid(pos, 4).toUInt();
         if(o > offset) {
           o += delta;
         }
@@ -566,18 +420,18 @@ MP4::Tag::updateOffsets(long delta, long offset)
     }
 
     MP4::AtomList co64 = moov->findall("co64", true);
-    for(MP4::AtomList::ConstIterator it = co64.begin(); it != co64.end(); ++it) {
-      MP4::Atom *atom = *it;
+    for(unsigned int i = 0; i < co64.size(); i++) {
+      MP4::Atom *atom = co64[i];
       if(atom->offset > offset) {
         atom->offset += delta;
       }
       d->file->seek(atom->offset + 12);
       ByteVector data = d->file->readBlock(atom->length - 12);
-      unsigned int count = data.toUInt();
+      unsigned int count = data.mid(0, 4).toUInt();
       d->file->seek(atom->offset + 16);
-      unsigned int pos = 4;
+      int pos = 4;
       while(count--) {
-        long long o = data.toLongLong(pos);
+        long long o = data.mid(pos, 8).toLongLong();
         if(o > offset) {
           o += delta;
         }
@@ -590,16 +444,16 @@ MP4::Tag::updateOffsets(long delta, long offset)
   MP4::Atom *moof = d->atoms->find("moof");
   if(moof) {
     MP4::AtomList tfhd = moof->findall("tfhd", true);
-    for(MP4::AtomList::ConstIterator it = tfhd.begin(); it != tfhd.end(); ++it) {
-      MP4::Atom *atom = *it;
+    for(unsigned int i = 0; i < tfhd.size(); i++) {
+      MP4::Atom *atom = tfhd[i];
       if(atom->offset > offset) {
         atom->offset += delta;
       }
       d->file->seek(atom->offset + 9);
-      ByteVector data = d->file->readBlock(atom->length - 9);
-      const unsigned int flags = data.toUInt(0, 3, true);
+      ByteVector data = d->file->readBlock(atom->offset - 9);
+      unsigned int flags = (ByteVector(1, '\0') + data.mid(0, 3)).toUInt();
       if(flags & 1) {
-        long long o = data.toLongLong(7U);
+        long long o = data.mid(7, 8).toLongLong();
         if(o > offset) {
           o += delta;
         }
@@ -611,11 +465,10 @@ MP4::Tag::updateOffsets(long delta, long offset)
 }
 
 void
-MP4::Tag::saveNew(ByteVector data)
+MP4::Tag::saveNew(ByteVector &data)
 {
-  data = renderAtom("meta", ByteVector(4, '\0') +
-                    renderAtom("hdlr", ByteVector(8, '\0') + ByteVector("mdirappl") +
-                               ByteVector(9, '\0')) +
+  data = renderAtom("meta", TagLib::ByteVector(4, '\0') +
+                    renderAtom("hdlr", TagLib::ByteVector(8, '\0') + TagLib::ByteVector("mdirappl") + TagLib::ByteVector(9, '\0')) +
                     data + padIlst(data));
 
   AtomList path = d->atoms->path("moov", "udta");
@@ -624,33 +477,26 @@ MP4::Tag::saveNew(ByteVector data)
     data = renderAtom("udta", data);
   }
 
-  long offset = path.back()->offset + 8;
+  long offset = path[path.size() - 1]->offset + 8;
   d->file->insert(data, offset, 0);
 
   updateParents(path, data.size());
   updateOffsets(data.size(), offset);
-
-  // Insert the newly created atoms into the tree to keep it up-to-date.
-
-  d->file->seek(offset);
-  path.back()->children.prepend(new Atom(d->file));
 }
 
 void
-MP4::Tag::saveExisting(ByteVector data, const AtomList &path)
+MP4::Tag::saveExisting(ByteVector &data, AtomList &path)
 {
-  AtomList::ConstIterator it = path.end();
-
-  MP4::Atom *ilst = *(--it);
+  MP4::Atom *ilst = path[path.size() - 1];
   long offset = ilst->offset;
   long length = ilst->length;
 
-  MP4::Atom *meta = *(--it);
-  AtomList::ConstIterator index = meta->children.find(ilst);
+  MP4::Atom *meta = path[path.size() - 2];
+  AtomList::Iterator index = meta->children.find(ilst);
 
   // check if there is an atom before 'ilst', and possibly use it as padding
   if(index != meta->children.begin()) {
-    AtomList::ConstIterator prevIndex = index;
+    AtomList::Iterator prevIndex = index;
     prevIndex--;
     MP4::Atom *prev = *prevIndex;
     if(prev->name == "free") {
@@ -659,7 +505,7 @@ MP4::Tag::saveExisting(ByteVector data, const AtomList &path)
     }
   }
   // check if there is an atom after 'ilst', and possibly use it as padding
-  AtomList::ConstIterator nextIndex = index;
+  AtomList::Iterator nextIndex = index;
   nextIndex++;
   if(nextIndex != meta->children.end()) {
     MP4::Atom *next = *nextIndex;
@@ -691,7 +537,7 @@ MP4::Tag::title() const
 {
   if(d->items.contains("\251nam"))
     return d->items["\251nam"].toStringList().toString(", ");
-  return String();
+  return String::null;
 }
 
 String
@@ -699,7 +545,7 @@ MP4::Tag::artist() const
 {
   if(d->items.contains("\251ART"))
     return d->items["\251ART"].toStringList().toString(", ");
-  return String();
+  return String::null;
 }
 
 String
@@ -707,7 +553,7 @@ MP4::Tag::album() const
 {
   if(d->items.contains("\251alb"))
     return d->items["\251alb"].toStringList().toString(", ");
-  return String();
+  return String::null;
 }
 
 String
@@ -715,7 +561,7 @@ MP4::Tag::comment() const
 {
   if(d->items.contains("\251cmt"))
     return d->items["\251cmt"].toStringList().toString(", ");
-  return String();
+  return String::null;
 }
 
 String
@@ -723,7 +569,7 @@ MP4::Tag::genre() const
 {
   if(d->items.contains("\251gen"))
     return d->items["\251gen"].toStringList().toString(", ");
-  return String();
+  return String::null;
 }
 
 unsigned int
@@ -773,211 +619,20 @@ MP4::Tag::setGenre(const String &value)
 }
 
 void
-MP4::Tag::setYear(unsigned int value)
+MP4::Tag::setYear(uint value)
 {
   d->items["\251day"] = StringList(String::number(value));
 }
 
 void
-MP4::Tag::setTrack(unsigned int value)
+MP4::Tag::setTrack(uint value)
 {
   d->items["trkn"] = MP4::Item(value, 0);
 }
 
-bool MP4::Tag::isEmpty() const
-{
-  return d->items.isEmpty();
-}
-
-MP4::ItemMap &MP4::Tag::itemListMap()
+MP4::ItemListMap &
+MP4::Tag::itemListMap()
 {
   return d->items;
 }
 
-const MP4::ItemMap &MP4::Tag::itemMap() const
-{
-  return d->items;
-}
-
-MP4::Item MP4::Tag::item(const String &key) const
-{
-  return d->items[key];
-}
-
-void MP4::Tag::setItem(const String &key, const Item &value)
-{
-  d->items[key] = value;
-}
-
-void MP4::Tag::removeItem(const String &key)
-{
-  d->items.erase(key);
-}
-
-bool MP4::Tag::contains(const String &key) const
-{
-  return d->items.contains(key);
-}
-
-namespace
-{
-  const char *keyTranslation[][2] = {
-    { "\251nam", "TITLE" },
-    { "\251ART", "ARTIST" },
-    { "\251alb", "ALBUM" },
-    { "\251cmt", "COMMENT" },
-    { "\251gen", "GENRE" },
-    { "\251day", "DATE" },
-    { "\251wrt", "COMPOSER" },
-    { "\251grp", "GROUPING" },
-    { "aART", "ALBUMARTIST" },
-    { "trkn", "TRACKNUMBER" },
-    { "disk", "DISCNUMBER" },
-    { "cpil", "COMPILATION" },
-    { "tmpo", "BPM" },
-    { "cprt", "COPYRIGHT" },
-    { "\251lyr", "LYRICS" },
-    { "\251too", "ENCODEDBY" },
-    { "soal", "ALBUMSORT" },
-    { "soaa", "ALBUMARTISTSORT" },
-    { "soar", "ARTISTSORT" },
-    { "sonm", "TITLESORT" },
-    { "soco", "COMPOSERSORT" },
-    { "sosn", "SHOWSORT" },
-    { "----:com.apple.iTunes:MusicBrainz Track Id", "MUSICBRAINZ_TRACKID" },
-    { "----:com.apple.iTunes:MusicBrainz Artist Id", "MUSICBRAINZ_ARTISTID" },
-    { "----:com.apple.iTunes:MusicBrainz Album Id", "MUSICBRAINZ_ALBUMID" },
-    { "----:com.apple.iTunes:MusicBrainz Album Artist Id", "MUSICBRAINZ_ALBUMARTISTID" },
-    { "----:com.apple.iTunes:MusicBrainz Release Group Id", "MUSICBRAINZ_RELEASEGROUPID" },
-    { "----:com.apple.iTunes:MusicBrainz Work Id", "MUSICBRAINZ_WORKID" },
-    { "----:com.apple.iTunes:ASIN", "ASIN" },
-    { "----:com.apple.iTunes:LABEL", "LABEL" },
-    { "----:com.apple.iTunes:LYRICIST", "LYRICIST" },
-    { "----:com.apple.iTunes:CONDUCTOR", "CONDUCTOR" },
-    { "----:com.apple.iTunes:REMIXER", "REMIXER" },
-    { "----:com.apple.iTunes:ENGINEER", "ENGINEER" },
-    { "----:com.apple.iTunes:PRODUCER", "PRODUCER" },
-    { "----:com.apple.iTunes:DJMIXER", "DJMIXER" },
-    { "----:com.apple.iTunes:MIXER", "MIXER" },
-    { "----:com.apple.iTunes:SUBTITLE", "SUBTITLE" },
-    { "----:com.apple.iTunes:DISCSUBTITLE", "DISCSUBTITLE" },
-    { "----:com.apple.iTunes:MOOD", "MOOD" },
-    { "----:com.apple.iTunes:ISRC", "ISRC" },
-    { "----:com.apple.iTunes:CATALOGNUMBER", "CATALOGNUMBER" },
-    { "----:com.apple.iTunes:BARCODE", "BARCODE" },
-    { "----:com.apple.iTunes:SCRIPT", "SCRIPT" },
-    { "----:com.apple.iTunes:LANGUAGE", "LANGUAGE" },
-    { "----:com.apple.iTunes:LICENSE", "LICENSE" },
-    { "----:com.apple.iTunes:MEDIA", "MEDIA" },
-  };
-  const size_t keyTranslationSize = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-
-  String translateKey(const String &key)
-  {
-    for(size_t i = 0; i < keyTranslationSize; ++i) {
-      if(key == keyTranslation[i][0])
-        return keyTranslation[i][1];
-    }
-
-    return String();
-  }
-}
-
-PropertyMap MP4::Tag::properties() const
-{
-  PropertyMap props;
-  for(MP4::ItemMap::ConstIterator it = d->items.begin(); it != d->items.end(); ++it) {
-    const String key = translateKey(it->first);
-    if(!key.isEmpty()) {
-      if(key == "TRACKNUMBER" || key == "DISCNUMBER") {
-        MP4::Item::IntPair ip = it->second.toIntPair();
-        String value = String::number(ip.first);
-        if(ip.second) {
-          value += "/" + String::number(ip.second);
-        }
-        props[key] = value;
-      }
-      else if(key == "BPM") {
-        props[key] = String::number(it->second.toInt());
-      }
-      else if(key == "COMPILATION") {
-        props[key] = String::number(it->second.toBool());
-      }
-      else {
-        props[key] = it->second.toStringList();
-      }
-    }
-    else {
-      props.unsupportedData().append(it->first);
-    }
-  }
-  return props;
-}
-
-void MP4::Tag::removeUnsupportedProperties(const StringList &props)
-{
-  for(StringList::ConstIterator it = props.begin(); it != props.end(); ++it)
-    d->items.erase(*it);
-}
-
-PropertyMap MP4::Tag::setProperties(const PropertyMap &props)
-{
-  static Map<String, String> reverseKeyMap;
-  if(reverseKeyMap.isEmpty()) {
-    int numKeys = sizeof(keyTranslation) / sizeof(keyTranslation[0]);
-    for(int i = 0; i < numKeys; i++) {
-      reverseKeyMap[keyTranslation[i][1]] = keyTranslation[i][0];
-    }
-  }
-
-  PropertyMap origProps = properties();
-  for(PropertyMap::ConstIterator it = origProps.begin(); it != origProps.end(); ++it) {
-    if(!props.contains(it->first) || props[it->first].isEmpty()) {
-      d->items.erase(reverseKeyMap[it->first]);
-    }
-  }
-
-  PropertyMap ignoredProps;
-  for(PropertyMap::ConstIterator it = props.begin(); it != props.end(); ++it) {
-    if(reverseKeyMap.contains(it->first)) {
-      String name = reverseKeyMap[it->first];
-      if((it->first == "TRACKNUMBER" || it->first == "DISCNUMBER") && !it->second.isEmpty()) {
-        int first = 0, second = 0;
-        StringList parts = StringList::split(it->second.front(), "/");
-        if(!parts.isEmpty()) {
-          first = parts[0].toInt();
-          if(parts.size() > 1) {
-            second = parts[1].toInt();
-          }
-          d->items[name] = MP4::Item(first, second);
-        }
-      }
-      else if(it->first == "BPM" && !it->second.isEmpty()) {
-        int value = it->second.front().toInt();
-        d->items[name] = MP4::Item(value);
-      }
-      else if(it->first == "COMPILATION" && !it->second.isEmpty()) {
-        bool value = (it->second.front().toInt() != 0);
-        d->items[name] = MP4::Item(value);
-      }
-      else {
-        d->items[name] = it->second;
-      }
-    }
-    else {
-      ignoredProps.insert(it->first, it->second);
-    }
-  }
-
-  return ignoredProps;
-}
-
-void MP4::Tag::addItem(const String &name, const Item &value)
-{
-  if(!d->items.contains(name)) {
-    d->items.insert(name, value);
-  }
-  else {
-    debug("MP4: Ignoring duplicate atom \"" + name + "\"");
-  }
-}

taglib/mp4/mp4tag.h

@@ -1,5 +1,5 @@
 /**************************************************************************
-    copyright            : (C) 2007,2011 by Lukáš Lalinský
+    copyright            : (C) 2007 by Lukáš Lalinský
     email                : lalinsky@gmail.com
  **************************************************************************/
 
@@ -39,112 +39,60 @@ namespace TagLib {
 
   namespace MP4 {
 
-    /*!
-     * \deprecated
-     */
     typedef TagLib::Map<String, Item> ItemListMap;
-    typedef TagLib::Map<String, Item> ItemMap;
 
     class TAGLIB_EXPORT Tag: public TagLib::Tag
     {
     public:
         Tag();
         Tag(TagLib::File *file, Atoms *atoms);
-        virtual ~Tag();
+        ~Tag();
         bool save();
 
-        virtual String title() const;
-        virtual String artist() const;
-        virtual String album() const;
-        virtual String comment() const;
-        virtual String genre() const;
-        virtual unsigned int year() const;
-        virtual unsigned int track() const;
+        String title() const;
+        String artist() const;
+        String album() const;
+        String comment() const;
+        String genre() const;
+        uint year() const;
+        uint track() const;
 
-        virtual void setTitle(const String &value);
-        virtual void setArtist(const String &value);
-        virtual void setAlbum(const String &value);
-        virtual void setComment(const String &value);
-        virtual void setGenre(const String &value);
-        virtual void setYear(unsigned int value);
-        virtual void setTrack(unsigned int value);
+        void setTitle(const String &value);
+        void setArtist(const String &value);
+        void setAlbum(const String &value);
+        void setComment(const String &value);
+        void setGenre(const String &value);
+        void setYear(uint value);
+        void setTrack(uint value);
 
-        virtual bool isEmpty() const;
-
-        /*!
-         * \deprecated Use the item() and setItem() API instead
-         */
-        ItemMap &itemListMap();
-
-        /*!
-         * Returns a string-keyed map of the MP4::Items for this tag.
-         */
-        const ItemMap &itemMap() const;
-
-        /*!
-         * \return The item, if any, corresponding to \a key.
-         */
-        Item item(const String &key) const;
-
-        /*!
-         * Sets the value of \a key to \a value, overwriting any previous value.
-         */
-        void setItem(const String &key, const Item &value);
-
-        /*!
-         * Removes the entry with \a key from the tag, or does nothing if it does
-         * not exist.
-         */
-        void removeItem(const String &key);
-
-        /*!
-         * \return True if the tag contains an entry for \a key.
-         */
-        bool contains(const String &key) const;
-
-        PropertyMap properties() const;
-        void removeUnsupportedProperties(const StringList& properties);
-        PropertyMap setProperties(const PropertyMap &properties);
+        ItemListMap &itemListMap();
 
     private:
-        AtomDataList parseData2(const Atom *atom, int expectedFlags = -1,
-                                bool freeForm = false);
-        ByteVectorList parseData(const Atom *atom, int expectedFlags = -1,
-                                 bool freeForm = false);
-        void parseText(const Atom *atom, int expectedFlags = 1);
-        void parseFreeForm(const Atom *atom);
-        void parseInt(const Atom *atom);
-        void parseByte(const Atom *atom);
-        void parseUInt(const Atom *atom);
-        void parseLongLong(const Atom *atom);
-        void parseGnre(const Atom *atom);
-        void parseIntPair(const Atom *atom);
-        void parseBool(const Atom *atom);
-        void parseCovr(const Atom *atom);
+        TagLib::ByteVectorList parseData(Atom *atom, TagLib::File *file, int expectedFlags = -1, bool freeForm = false);
+        void parseText(Atom *atom, TagLib::File *file, int expectedFlags = 1);
+        void parseFreeForm(Atom *atom, TagLib::File *file);
+        void parseInt(Atom *atom, TagLib::File *file);
+        void parseGnre(Atom *atom, TagLib::File *file);
+        void parseIntPair(Atom *atom, TagLib::File *file);
+        void parseBool(Atom *atom, TagLib::File *file);
+        void parseCovr(Atom *atom, TagLib::File *file);
 
-        ByteVector padIlst(const ByteVector &data, int length = -1) const;
-        ByteVector renderAtom(const ByteVector &name, const ByteVector &data) const;
-        ByteVector renderData(const ByteVector &name, int flags,
-                              const ByteVectorList &data) const;
-        ByteVector renderText(const ByteVector &name, const Item &item,
-                              int flags = TypeUTF8) const;
-        ByteVector renderFreeForm(const String &name, const Item &item) const;
-        ByteVector renderBool(const ByteVector &name, const Item &item) const;
-        ByteVector renderInt(const ByteVector &name, const Item &item) const;
-        ByteVector renderByte(const ByteVector &name, const Item &item) const;
-        ByteVector renderUInt(const ByteVector &name, const Item &item) const;
-        ByteVector renderLongLong(const ByteVector &name, const Item &item) const;
-        ByteVector renderIntPair(const ByteVector &name, const Item &item) const;
-        ByteVector renderIntPairNoTrailing(const ByteVector &name, const Item &item) const;
-        ByteVector renderCovr(const ByteVector &name, const Item &item) const;
+        TagLib::ByteVector padIlst(const ByteVector &data, int length = -1);
+        TagLib::ByteVector renderAtom(const ByteVector &name, const TagLib::ByteVector &data);
+        TagLib::ByteVector renderData(const ByteVector &name, int flags, const TagLib::ByteVectorList &data);
+        TagLib::ByteVector renderText(const ByteVector &name, Item &item, int flags = 1);
+        TagLib::ByteVector renderFreeForm(const String &name, Item &item);
+        TagLib::ByteVector renderBool(const ByteVector &name, Item &item);
+        TagLib::ByteVector renderInt(const ByteVector &name, Item &item);
+        TagLib::ByteVector renderIntPair(const ByteVector &name, Item &item);
+        TagLib::ByteVector renderIntPairNoTrailing(const ByteVector &name, Item &item);
+        TagLib::ByteVector renderCovr(const ByteVector &name, Item &item);
 
-        void updateParents(const AtomList &path, long delta, int ignore = 0);
+        void updateParents(AtomList &path, long delta, int ignore = 0);
         void updateOffsets(long delta, long offset);
 
-        void saveNew(ByteVector data);
-        void saveExisting(ByteVector data, const AtomList &path);
-
-        void addItem(const String &name, const Item &value);
+        void saveNew(TagLib::ByteVector &data);
+        void saveExisting(TagLib::ByteVector &data, AtomList &path);
 
         class TagPrivate;
         TagPrivate *d;

taglib/mpc/mpcfile.cpp

@@ -27,8 +27,6 @@
 #include <tstring.h>
 #include <tagunion.h>
 #include <tdebug.h>
-#include <tpropertymap.h>
-#include <tagutils.h>
 
 #include "mpcfile.h"
 #include "id3v1tag.h"
@@ -40,7 +38,7 @@ using namespace TagLib;
 
 namespace
 {
-  enum { MPCAPEIndex = 0, MPCID3v1Index = 1 };
+  enum { APEIndex, ID3v1Index };
 }
 
 class MPC::File::FilePrivate
@@ -53,7 +51,11 @@ public:
     ID3v2Header(0),
     ID3v2Location(-1),
     ID3v2Size(0),
-    properties(0) {}
+    properties(0),
+    scanned(false),
+    hasAPE(false),
+    hasID3v1(false),
+    hasID3v2(false) {}
 
   ~FilePrivate()
   {
@@ -62,37 +64,43 @@ public:
   }
 
   long APELocation;
-  long APESize;
+  uint APESize;
 
   long ID3v1Location;
 
   ID3v2::Header *ID3v2Header;
   long ID3v2Location;
-  long ID3v2Size;
+  uint ID3v2Size;
 
   TagUnion tag;
 
   Properties *properties;
+  bool scanned;
+
+  // These indicate whether the file *on disk* has these tags, not if
+  // this data structure does.  This is used in computing offsets.
+
+  bool hasAPE;
+  bool hasID3v1;
+  bool hasID3v2;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MPC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
-  d(new FilePrivate())
+MPC::File::File(FileName file, bool readProperties,
+                Properties::ReadStyle propertiesStyle) : TagLib::File(file)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
-MPC::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
-  d(new FilePrivate())
+MPC::File::File(IOStream *stream, bool readProperties,
+                Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
 {
-  if(isOpen())
-    read(readProperties);
+  d = new FilePrivate;
+  read(readProperties, propertiesStyle);
 }
 
 MPC::File::~File()
@@ -105,24 +113,6 @@ TagLib::Tag *MPC::File::tag() const
   return &d->tag;
 }
 
-PropertyMap MPC::File::properties() const
-{
-  return d->tag.properties();
-}
-
-void MPC::File::removeUnsupportedProperties(const StringList &properties)
-{
-  d->tag.removeUnsupportedProperties(properties);
-}
-
-PropertyMap MPC::File::setProperties(const PropertyMap &properties)
-{
-  if(ID3v1Tag())
-    ID3v1Tag()->setProperties(properties);
-
-  return APETag(true)->setProperties(properties);
-}
-
 MPC::Properties *MPC::File::audioProperties() const
 {
   return d->properties;
@@ -137,109 +127,101 @@ bool MPC::File::save()
 
   // Possibly strip ID3v2 tag
 
-  if(!d->ID3v2Header && d->ID3v2Location >= 0) {
+  if(d->hasID3v2 && !d->ID3v2Header) {
     removeBlock(d->ID3v2Location, d->ID3v2Size);
-
-    if(d->APELocation >= 0)
-      d->APELocation -= d->ID3v2Size;
-
-    if(d->ID3v1Location >= 0)
+    d->hasID3v2 = false;
+    if(d->hasID3v1)
       d->ID3v1Location -= d->ID3v2Size;
-
-    d->ID3v2Location = -1;
-    d->ID3v2Size = 0;
+    if(d->hasAPE)
+      d->APELocation -= d->ID3v2Size;
   }
 
   // Update ID3v1 tag
 
-  if(ID3v1Tag() && !ID3v1Tag()->isEmpty()) {
-
-    // ID3v1 tag is not empty. Update the old one or create a new one.
-
-    if(d->ID3v1Location >= 0) {
+  if(ID3v1Tag()) {
+    if(d->hasID3v1) {
       seek(d->ID3v1Location);
+      writeBlock(ID3v1Tag()->render());
     }
     else {
       seek(0, End);
       d->ID3v1Location = tell();
+      writeBlock(ID3v1Tag()->render());
+      d->hasID3v1 = true;
     }
-
-    writeBlock(ID3v1Tag()->render());
-  }
-  else {
-
-    // ID3v1 tag is empty. Remove the old one.
-
-    if(d->ID3v1Location >= 0) {
-      truncate(d->ID3v1Location);
-      d->ID3v1Location = -1;
+  } else
+    if(d->hasID3v1) {
+      removeBlock(d->ID3v1Location, 128);
+      d->hasID3v1 = false;
+      if(d->hasAPE) {
+        if(d->APELocation > d->ID3v1Location)
+          d->APELocation -= 128;
+      }
     }
-  }
 
   // Update APE tag
 
-  if(APETag() && !APETag()->isEmpty()) {
-
-    // APE tag is not empty. Update the old one or create a new one.
-
-    if(d->APELocation < 0) {
-      if(d->ID3v1Location >= 0)
+  if(APETag()) {
+    if(d->hasAPE)
+      insert(APETag()->render(), d->APELocation, d->APESize);
+    else {
+      if(d->hasID3v1)  {
+        insert(APETag()->render(), d->ID3v1Location, 0);
+        d->APESize = APETag()->footer()->completeTagSize();
+        d->hasAPE = true;
         d->APELocation = d->ID3v1Location;
-      else
-        d->APELocation = length();
+        d->ID3v1Location += d->APESize;
+      }
+      else {
+        seek(0, End);
+        d->APELocation = tell();
+        writeBlock(APETag()->render());
+        d->APESize = APETag()->footer()->completeTagSize();
+        d->hasAPE = true;
+      }
     }
-
-    const ByteVector data = APETag()->render();
-    insert(data, d->APELocation, d->APESize);
-
-    if(d->ID3v1Location >= 0)
-      d->ID3v1Location += (static_cast<long>(data.size()) - d->APESize);
-
-    d->APESize = data.size();
   }
-  else {
-
-    // APE tag is empty. Remove the old one.
-
-    if(d->APELocation >= 0) {
+  else
+    if(d->hasAPE) {
       removeBlock(d->APELocation, d->APESize);
-
-      if(d->ID3v1Location >= 0)
-        d->ID3v1Location -= d->APESize;
-
-      d->APELocation = -1;
-      d->APESize = 0;
+      d->hasAPE = false;
+      if(d->hasID3v1) {
+        if(d->ID3v1Location > d->APELocation)
+          d->ID3v1Location -= d->APESize;
+      }
     }
-  }
 
   return true;
 }
 
 ID3v1::Tag *MPC::File::ID3v1Tag(bool create)
 {
-  return d->tag.access<ID3v1::Tag>(MPCID3v1Index, create);
+  return d->tag.access<ID3v1::Tag>(ID3v1Index, create);
 }
 
 APE::Tag *MPC::File::APETag(bool create)
 {
-  return d->tag.access<APE::Tag>(MPCAPEIndex, create);
+  return d->tag.access<APE::Tag>(APEIndex, create);
 }
 
 void MPC::File::strip(int tags)
 {
-  if(tags & ID3v1)
-    d->tag.set(MPCID3v1Index, 0);
-
-  if(tags & APE)
-    d->tag.set(MPCAPEIndex, 0);
-
-  if(!ID3v1Tag())
+  if(tags & ID3v1) {
+    d->tag.set(ID3v1Index, 0);
     APETag(true);
+  }
 
   if(tags & ID3v2) {
     delete d->ID3v2Header;
     d->ID3v2Header = 0;
   }
+
+  if(tags & APE) {
+    d->tag.set(APEIndex, 0);
+
+    if(!ID3v1Tag())
+      APETag(true);
+  }
 }
 
 void MPC::File::remove(int tags)
@@ -247,73 +229,104 @@ void MPC::File::remove(int tags)
   strip(tags);
 }
 
-bool MPC::File::hasID3v1Tag() const
-{
-  return (d->ID3v1Location >= 0);
-}
-
-bool MPC::File::hasAPETag() const
-{
-  return (d->APELocation >= 0);
-}
 
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-void MPC::File::read(bool readProperties)
+void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesStyle */)
 {
-  // Look for an ID3v2 tag
+  // Look for an ID3v1 tag
 
-  d->ID3v2Location = Utils::findID3v2(this);
+  d->ID3v1Location = findID3v1();
+
+  if(d->ID3v1Location >= 0) {
+    d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+    d->hasID3v1 = true;
+  }
+
+  // Look for an APE tag
+
+  findAPE();
+
+  d->APELocation = findAPE();
+
+  if(d->APELocation >= 0) {
+    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;
+  }
+
+  if(!d->hasID3v1)
+    APETag(true);
+
+  // Look for and skip an ID3v2 tag
+
+  d->ID3v2Location = findID3v2();
 
   if(d->ID3v2Location >= 0) {
     seek(d->ID3v2Location);
     d->ID3v2Header = new ID3v2::Header(readBlock(ID3v2::Header::size()));
     d->ID3v2Size = d->ID3v2Header->completeTagSize();
+    d->hasID3v2 = true;
   }
 
-  // Look for an ID3v1 tag
-
-  d->ID3v1Location = Utils::findID3v1(this);
-
-  if(d->ID3v1Location >= 0)
-    d->tag.set(MPCID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
-
-  // Look for an APE tag
-
-  d->APELocation = Utils::findAPE(this, d->ID3v1Location);
-
-  if(d->APELocation >= 0) {
-    d->tag.set(MPCAPEIndex, new APE::Tag(this, d->APELocation));
-    d->APESize = APETag()->footer()->completeTagSize();
-    d->APELocation = d->APELocation + APE::Footer::size() - d->APESize;
-  }
-
-  if(d->ID3v1Location < 0)
-    APETag(true);
+  if(d->hasID3v2)
+    seek(d->ID3v2Location + d->ID3v2Size);
+  else
+    seek(0);
 
   // Look for MPC metadata
 
   if(readProperties) {
-
-    long streamLength;
-
-    if(d->APELocation >= 0)
-      streamLength = d->APELocation;
-    else if(d->ID3v1Location >= 0)
-      streamLength = d->ID3v1Location;
-    else
-      streamLength = length();
-
-    if(d->ID3v2Location >= 0) {
-      seek(d->ID3v2Location + d->ID3v2Size);
-      streamLength -= (d->ID3v2Location + d->ID3v2Size);
-    }
-    else {
-      seek(0);
-    }
-
-    d->properties = new Properties(this, streamLength);
+    d->properties = new Properties(readBlock(MPC::HeaderSize),
+                                   length() - d->ID3v2Size - d->APESize);
   }
 }
+
+long MPC::File::findAPE()
+{
+  if(!isValid())
+    return -1;
+
+  if(d->hasID3v1)
+    seek(-160, End);
+  else
+    seek(-32, End);
+
+  long p = tell();
+
+  if(readBlock(8) == APE::Tag::fileIdentifier())
+    return p;
+
+  return -1;
+}
+
+long MPC::File::findID3v1()
+{
+  if(!isValid())
+    return -1;
+
+  seek(-128, End);
+  long p = tell();
+
+  if(readBlock(3) == ID3v1::Tag::fileIdentifier())
+    return p;
+
+  return -1;
+}
+
+long MPC::File::findID3v2()
+{
+  if(!isValid())
+    return -1;
+
+  seek(0);
+
+  if(readBlock(3) == ID3v2::Header::fileIdentifier())
+    return 0;
+
+  return -1;
+}

taglib/mpc/mpcfile.h

@@ -28,12 +28,9 @@
 
 #include "taglib_export.h"
 #include "tfile.h"
-#include "tag.h"
 
 #include "mpcproperties.h"
 
-#include "tlist.h"
-
 namespace TagLib {
 
   class Tag;
@@ -84,22 +81,17 @@ namespace TagLib {
       };
 
       /*!
-       * Constructs an MPC file from \a file.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
+       * Contructs an MPC 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(FileName file, bool readProperties = true,
            Properties::ReadStyle propertiesStyle = Properties::Average);
 
       /*!
-       * Constructs an MPC file from \a stream.  If \a readProperties is true the
-       * file's audio properties will also be read.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
-       *
-       * \note In the current implementation, \a propertiesStyle is ignored.
+       * Contructs an MPC 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);
@@ -115,22 +107,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 the APE
-       * tag  will be converted to the PropertyMap.
-       */
-      PropertyMap properties() const;
-
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * Affects only the APEv2 tag which will be created if necessary.
-       * If an ID3v1 tag exists, it will be updated as well.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the MPC::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.
@@ -139,47 +115,34 @@ namespace TagLib {
 
       /*!
        * Saves the file.
-       *
-       * This returns true if the save was successful.
        */
       virtual bool save();
 
       /*!
        * Returns a pointer to the ID3v1 tag of the file.
        *
-       * If \a create is false (the default) this returns a null pointer
-       * if there is no valid APE tag.  If \a create is true it will create
-       * an APE tag if one does not exist and returns a valid pointer.
+       * If \a create is false (the default) this will return a null pointer
+       * if there is no valid ID3v1 tag.  If \a create is true it will create
+       * an ID3v1 tag if one does not exist. If there is already an APE tag, the
+       * new ID3v1 tag will be placed after it.
        *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an ID3v1 tag.  Use hasID3v1Tag() to check if the file
-       * on disk actually has an ID3v1 tag.
-       *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
+       * \note The Tag <b>is still</b> owned by the APE::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasID3v1Tag()
        */
       ID3v1::Tag *ID3v1Tag(bool create = false);
 
       /*!
        * Returns a pointer to the APE tag of the file.
        *
-       * If \a create is false (the default) this may return a null pointer
+       * If \a create is false (the default) this will return a null pointer
        * if there is no valid APE tag.  If \a create is true it will create
-       * an APE tag if one does not exist and returns a valid pointer.  If
-       * there already be an ID3v1 tag, the new APE tag will be placed before it.
+       * a APE tag if one does not exist. If there is already an ID3v1 tag, thes
+       * new APE tag will be placed before it.
        *
-       * \note This may return a valid pointer regardless of whether or not the
-       * file on disk has an APE tag.  Use hasAPETag() to check if the file
-       * on disk actually has an APE tag.
-       *
-       * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
+       * \note The Tag <b>is still</b> owned by the APE::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
        * destroyed.
-       *
-       * \see hasAPETag()
        */
       APE::Tag *APETag(bool create = false);
 
@@ -200,25 +163,16 @@ namespace TagLib {
        */
       void remove(int tags = AllTags);
 
-      /*!
-       * Returns whether or not the file on disk actually has an ID3v1 tag.
-       *
-       * \see ID3v1Tag()
-       */
-      bool hasID3v1Tag() const;
-
-      /*!
-       * Returns whether or not the file on disk actually has an APE tag.
-       *
-       * \see APETag()
-       */
-      bool hasAPETag() const;
 
     private:
       File(const File &);
       File &operator=(const File &);
 
-      void read(bool readProperties);
+      void read(bool readProperties, Properties::ReadStyle propertiesStyle);
+      void scan();
+      long findAPE();
+      long findID3v1();
+      long findID3v2();
 
       class FilePrivate;
       FilePrivate *d;

taglib/mpc/mpcproperties.cpp

@@ -26,7 +26,6 @@
 #include <tstring.h>
 #include <tdebug.h>
 #include <bitset>
-#include <math.h>
 
 #include "mpcproperties.h"
 #include "mpcfile.h"
@@ -36,57 +35,34 @@ using namespace TagLib;
 class MPC::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate() :
+  PropertiesPrivate(const ByteVector &d, long length, ReadStyle s) :
+    data(d),
+    streamLength(length),
+    style(s),
     version(0),
     length(0),
     bitrate(0),
     sampleRate(0),
-    channels(0),
-    totalFrames(0),
-    sampleFrames(0),
-    trackGain(0),
-    trackPeak(0),
-    albumGain(0),
-    albumPeak(0) {}
+    channels(0) {}
 
-  int          version;
-  int          length;
-  int          bitrate;
-  int          sampleRate;
-  int          channels;
-  unsigned int totalFrames;
-  unsigned int sampleFrames;
-  unsigned int trackGain;
-  unsigned int trackPeak;
-  unsigned int albumGain;
-  unsigned int albumPeak;
-  String       flags;
+  ByteVector data;
+  long streamLength;
+  ReadStyle style;
+  int version;
+  int length;
+  int bitrate;
+  int sampleRate;
+  int channels;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-MPC::Properties::Properties(const ByteVector &data, long streamLength, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
+MPC::Properties::Properties(const ByteVector &data, long streamLength, ReadStyle style) : AudioProperties(style)
 {
-  readSV7(data, streamLength);
-}
-
-MPC::Properties::Properties(File *file, long streamLength, ReadStyle style) :
-  AudioProperties(style),
-  d(new PropertiesPrivate())
-{
-  ByteVector magic = file->readBlock(4);
-  if(magic == "MPCK") {
-    // Musepack version 8
-    readSV8(file, streamLength);
-  }
-  else {
-    // Musepack version 7 or older, fixed size header
-    readSV7(magic + file->readBlock(MPC::HeaderSize - 4), streamLength);
-  }
+  d = new PropertiesPrivate(data, streamLength, style);
+  read();
 }
 
 MPC::Properties::~Properties()
@@ -95,16 +71,6 @@ MPC::Properties::~Properties()
 }
 
 int MPC::Properties::length() const
-{
-  return lengthInSeconds();
-}
-
-int MPC::Properties::lengthInSeconds() const
-{
-  return d->length / 1000;
-}
-
-int MPC::Properties::lengthInMilliseconds() const
 {
   return d->length;
 }
@@ -129,241 +95,46 @@ int MPC::Properties::mpcVersion() const
   return d->version;
 }
 
-unsigned int MPC::Properties::totalFrames() const
-{
-  return d->totalFrames;
-}
-
-unsigned int MPC::Properties::sampleFrames() const
-{
-  return d->sampleFrames;
-}
-
-int MPC::Properties::trackGain() const
-{
-  return d->trackGain;
-}
-
-int MPC::Properties::trackPeak() const
-{
-  return d->trackPeak;
-}
-
-int MPC::Properties::albumGain() const
-{
-  return d->albumGain;
-}
-
-int MPC::Properties::albumPeak() const
-{
-  return d->albumPeak;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-namespace
+static const unsigned short sftable [4] = { 44100, 48000, 37800, 32000 };
+
+void MPC::Properties::read()
 {
-  unsigned long readSize(File *file, unsigned int &sizeLength, bool &eof)
-  {
-    sizeLength = 0;
-    eof = false;
+  if(!d->data.startsWith("MP+"))
+    return;
 
-    unsigned char tmp;
-    unsigned long size = 0;
+  d->version = d->data[3] & 15;
 
-    do {
-      const ByteVector b = file->readBlock(1);
-      if(b.isEmpty()) {
-        eof = true;
-        break;
-      }
+  unsigned int frames;
 
-      tmp = b[0];
-      size = (size << 7) | (tmp & 0x7F);
-      sizeLength++;
-    } while((tmp & 0x80));
-    return size;
-  }
+  if(d->version >= 7) {
+    frames = d->data.mid(4, 4).toUInt(false);
 
-  unsigned long readSize(const ByteVector &data, unsigned int &pos)
-  {
-    unsigned char tmp;
-    unsigned long size = 0;
-
-    do {
-      tmp = data[pos++];
-      size = (size << 7) | (tmp & 0x7F);
-    } while((tmp & 0x80) && (pos < data.size()));
-    return size;
-  }
-
-  // This array looks weird, but the same as original MusePack code found at:
-  // https://www.musepack.net/index.php?pg=src
-  const unsigned short sftable [8] = { 44100, 48000, 37800, 32000, 0, 0, 0, 0 };
-}
-
-void MPC::Properties::readSV8(File *file, long streamLength)
-{
-  bool readSH = false, readRG = false;
-
-  while(!readSH && !readRG) {
-    const ByteVector packetType = file->readBlock(2);
-
-    unsigned int packetSizeLength;
-    bool eof;
-    const unsigned long packetSize = readSize(file, packetSizeLength, eof);
-    if(eof) {
-      debug("MPC::Properties::readSV8() - Reached to EOF.");
-      break;
-    }
-
-    const unsigned long dataSize = packetSize - 2 - packetSizeLength;
-
-    const ByteVector data = file->readBlock(dataSize);
-    if(data.size() != dataSize) {
-      debug("MPC::Properties::readSV8() - dataSize doesn't match the actual data size.");
-      break;
-    }
-
-    if(packetType == "SH") {
-      // Stream Header
-      // http://trac.musepack.net/wiki/SV8Specification#StreamHeaderPacket
-
-      if(dataSize <= 5) {
-        debug("MPC::Properties::readSV8() - \"SH\" packet is too short to parse.");
-        break;
-      }
-
-      readSH = true;
-
-      unsigned int pos = 4;
-      d->version = data[pos];
-      pos += 1;
-      d->sampleFrames = readSize(data, pos);
-      if(pos > dataSize - 3) {
-        debug("MPC::Properties::readSV8() - \"SH\" packet is corrupt.");
-        break;
-      }
-
-      const unsigned long begSilence = readSize(data, pos);
-      if(pos > dataSize - 2) {
-        debug("MPC::Properties::readSV8() - \"SH\" packet is corrupt.");
-        break;
-      }
-
-      const unsigned short flags = data.toUShort(pos, true);
-      pos += 2;
-
-      d->sampleRate = sftable[(flags >> 13) & 0x07];
-      d->channels   = ((flags >> 4) & 0x0F) + 1;
-
-      const unsigned int frameCount = d->sampleFrames - begSilence;
-      if(frameCount > 0 && d->sampleRate > 0) {
-        const double length = frameCount * 1000.0 / d->sampleRate;
-        d->length  = static_cast<int>(length + 0.5);
-        d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-      }
-    }
-    else if (packetType == "RG") {
-      // Replay Gain
-      // http://trac.musepack.net/wiki/SV8Specification#ReplaygainPacket
-
-      if(dataSize <= 9) {
-        debug("MPC::Properties::readSV8() - \"RG\" packet is too short to parse.");
-        break;
-      }
-
-      readRG = true;
-
-      const int replayGainVersion = data[0];
-      if(replayGainVersion == 1) {
-        d->trackGain = data.toShort(1, true);
-        d->trackPeak = data.toShort(3, true);
-        d->albumGain = data.toShort(5, true);
-        d->albumPeak = data.toShort(7, true);
-      }
-    }
-
-    else if(packetType == "SE") {
-      break;
-    }
-
-    else {
-      file->seek(dataSize, File::Current);
-    }
-  }
-}
-
-void MPC::Properties::readSV7(const ByteVector &data, long streamLength)
-{
-  if(data.startsWith("MP+")) {
-    d->version = data[3] & 15;
-    if(d->version < 7)
-      return;
-
-    d->totalFrames = data.toUInt(4, false);
-
-    const unsigned int flags = data.toUInt(8, false);
-    d->sampleRate = sftable[(flags >> 16) & 0x03];
-    d->channels   = 2;
-
-    const unsigned int gapless = data.toUInt(5, false);
-
-    d->trackGain = data.toShort(14, false);
-    d->trackPeak = data.toShort(12, false);
-    d->albumGain = data.toShort(18, false);
-    d->albumPeak = data.toShort(16, false);
-
-    // convert gain info
-    if(d->trackGain != 0) {
-      int tmp = (int)((64.82 - (short)d->trackGain / 100.) * 256. + .5);
-      if(tmp >= (1 << 16) || tmp < 0) tmp = 0;
-      d->trackGain = tmp;
-    }
-
-    if(d->albumGain != 0) {
-      int tmp = (int)((64.82 - d->albumGain / 100.) * 256. + .5);
-      if(tmp >= (1 << 16) || tmp < 0) tmp = 0;
-      d->albumGain = tmp;
-    }
-
-    if (d->trackPeak != 0)
-      d->trackPeak = (int)(log10((double)d->trackPeak) * 20 * 256 + .5);
-
-    if (d->albumPeak != 0)
-      d->albumPeak = (int)(log10((double)d->albumPeak) * 20 * 256 + .5);
-
-    bool trueGapless = (gapless >> 31) & 0x0001;
-    if(trueGapless) {
-      unsigned int lastFrameSamples = (gapless >> 20) & 0x07FF;
-      d->sampleFrames = d->totalFrames * 1152 - lastFrameSamples;
-    }
-    else
-      d->sampleFrames = d->totalFrames * 1152 - 576;
+    std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(d->data.mid(8, 4).toUInt(false)));
+    d->sampleRate = sftable[flags[17] * 2 + flags[16]];
+    d->channels = 2;
   }
   else {
-    const unsigned int headerData = data.toUInt(0, false);
+    uint headerData = d->data.mid(0, 4).toUInt(false);
 
-    d->bitrate    = (headerData >> 23) & 0x01ff;
-    d->version    = (headerData >> 11) & 0x03ff;
+    d->bitrate = (headerData >> 23) & 0x01ff;
+    d->version = (headerData >> 11) & 0x03ff;
     d->sampleRate = 44100;
-    d->channels   = 2;
+    d->channels = 2;
 
     if(d->version >= 5)
-      d->totalFrames = data.toUInt(4, false);
+      frames = d->data.mid(4, 4).toUInt(false);
     else
-      d->totalFrames = data.toUShort(6, false);
-
-    d->sampleFrames = d->totalFrames * 1152 - 576;
+      frames = d->data.mid(6, 2).toUInt(false);
   }
 
-  if(d->sampleFrames > 0 && d->sampleRate > 0) {
-    const double length = d->sampleFrames * 1000.0 / d->sampleRate;
-    d->length = static_cast<int>(length + 0.5);
+  uint samples = frames * 1152 - 576;
 
-    if(d->bitrate == 0)
-      d->bitrate = static_cast<int>(streamLength * 8.0 / length + 0.5);
-  }
+  d->length = d->sampleRate > 0 ? (samples + (d->sampleRate / 2)) / d->sampleRate : 0;
+
+  if(!d->bitrate)
+    d->bitrate = d->length > 0 ? ((d->streamLength * 8L) / d->length) / 1000 : 0;
 }

taglib/mpc/mpcproperties.h

@@ -35,7 +35,7 @@ namespace TagLib {
 
     class File;
 
-    static const unsigned int HeaderSize = 8 * 7;
+    static const uint HeaderSize = 8*7;
 
     //! An implementation of audio property reading for MPC
 
@@ -50,104 +50,31 @@ namespace TagLib {
       /*!
        * Create an instance of MPC::Properties with the data read from the
        * ByteVector \a data.
-       *
-       * This constructor is deprecated. It only works for MPC version up to 7.
        */
       Properties(const ByteVector &data, long streamLength, ReadStyle style = Average);
 
-      /*!
-       * Create an instance of MPC::Properties with the data read directly
-       * from a MPC::File.
-       */
-      Properties(File *file, long streamLength, ReadStyle style = Average);
-
       /*!
        * Destroys this MPC::Properties instance.
        */
       virtual ~Properties();
 
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \note This method is just an alias of lengthInSeconds().
-       *
-       * \deprecated
-       */
+      // Reimplementations.
+
       virtual int length() const;
-
-      /*!
-       * Returns the length of the file in seconds.  The length is rounded down to
-       * the nearest whole second.
-       *
-       * \see lengthInMilliseconds()
-       */
-      // BIC: make virtual
-      int lengthInSeconds() const;
-
-      /*!
-       * Returns the length of the file in milliseconds.
-       *
-       * \see lengthInSeconds()
-       */
-      // BIC: make virtual
-      int lengthInMilliseconds() const;
-
-      /*!
-       * Returns the average bit rate of the file in kb/s.
-       */
       virtual int bitrate() const;
-
-      /*!
-       * Returns the sample rate in Hz.
-       */
       virtual int sampleRate() const;
-
-      /*!
-       * Returns the number of audio channels.
-       */
       virtual int channels() const;
 
       /*!
-       * Returns the version of the bitstream (SV4-SV8)
+       * Returns the version of the bitstream (SV4-SV7)
        */
       int mpcVersion() const;
 
-      unsigned int totalFrames() const;
-      unsigned int sampleFrames() const;
-
-      /*!
-      * Returns the track gain as an integer value,
-      * to convert to dB: trackGain in dB = 64.82 - (trackGain / 256)
-      */
-      int trackGain() const;
-
-      /*!
-      * Returns the track peak as an integer value,
-      * to convert to dB: trackPeak in dB = trackPeak / 256
-      * to convert to floating [-1..1]: trackPeak = 10^(trackPeak / 256 / 20)/32768
-      */
-      int trackPeak() const;
-
-      /*!
-      * Returns the album gain as an integer value,
-      * to convert to dB: albumGain in dB = 64.82 - (albumGain / 256)
-      */
-      int albumGain() const;
-
-      /*!
-      * Returns the album peak as an integer value,
-      * to convert to dB: albumPeak in dB = albumPeak / 256
-      * to convert to floating [-1..1]: albumPeak = 10^(albumPeak / 256 / 20)/32768
-      */
-      int albumPeak() const;
-
     private:
       Properties(const Properties &);
       Properties &operator=(const Properties &);
 
-      void readSV7(const ByteVector &data, long streamLength);
-      void readSV8(File *file, long streamLength);
+      void read();
 
       class PropertiesPrivate;
       PropertiesPrivate *d;

taglib/mpeg/id3v1/id3v1genres.cpp

@@ -27,239 +27,193 @@
 
 using namespace TagLib;
 
-namespace
-{
-  const wchar_t *genres[] = {
-    L"Blues",
-    L"Classic Rock",
-    L"Country",
-    L"Dance",
-    L"Disco",
-    L"Funk",
-    L"Grunge",
-    L"Hip-Hop",
-    L"Jazz",
-    L"Metal",
-    L"New Age",
-    L"Oldies",
-    L"Other",
-    L"Pop",
-    L"R&B",
-    L"Rap",
-    L"Reggae",
-    L"Rock",
-    L"Techno",
-    L"Industrial",
-    L"Alternative",
-    L"Ska",
-    L"Death Metal",
-    L"Pranks",
-    L"Soundtrack",
-    L"Euro-Techno",
-    L"Ambient",
-    L"Trip-Hop",
-    L"Vocal",
-    L"Jazz+Funk",
-    L"Fusion",
-    L"Trance",
-    L"Classical",
-    L"Instrumental",
-    L"Acid",
-    L"House",
-    L"Game",
-    L"Sound Clip",
-    L"Gospel",
-    L"Noise",
-    L"Alternative Rock",
-    L"Bass",
-    L"Soul",
-    L"Punk",
-    L"Space",
-    L"Meditative",
-    L"Instrumental Pop",
-    L"Instrumental Rock",
-    L"Ethnic",
-    L"Gothic",
-    L"Darkwave",
-    L"Techno-Industrial",
-    L"Electronic",
-    L"Pop-Folk",
-    L"Eurodance",
-    L"Dream",
-    L"Southern Rock",
-    L"Comedy",
-    L"Cult",
-    L"Gangsta",
-    L"Top 40",
-    L"Christian Rap",
-    L"Pop/Funk",
-    L"Jungle",
-    L"Native American",
-    L"Cabaret",
-    L"New Wave",
-    L"Psychedelic",
-    L"Rave",
-    L"Showtunes",
-    L"Trailer",
-    L"Lo-Fi",
-    L"Tribal",
-    L"Acid Punk",
-    L"Acid Jazz",
-    L"Polka",
-    L"Retro",
-    L"Musical",
-    L"Rock & Roll",
-    L"Hard Rock",
-    L"Folk",
-    L"Folk/Rock",
-    L"National Folk",
-    L"Swing",
-    L"Fusion",
-    L"Bebob",
-    L"Latin",
-    L"Revival",
-    L"Celtic",
-    L"Bluegrass",
-    L"Avantgarde",
-    L"Gothic Rock",
-    L"Progressive Rock",
-    L"Psychedelic Rock",
-    L"Symphonic Rock",
-    L"Slow Rock",
-    L"Big Band",
-    L"Chorus",
-    L"Easy Listening",
-    L"Acoustic",
-    L"Humour",
-    L"Speech",
-    L"Chanson",
-    L"Opera",
-    L"Chamber Music",
-    L"Sonata",
-    L"Symphony",
-    L"Booty Bass",
-    L"Primus",
-    L"Porn Groove",
-    L"Satire",
-    L"Slow Jam",
-    L"Club",
-    L"Tango",
-    L"Samba",
-    L"Folklore",
-    L"Ballad",
-    L"Power Ballad",
-    L"Rhythmic Soul",
-    L"Freestyle",
-    L"Duet",
-    L"Punk Rock",
-    L"Drum Solo",
-    L"A Cappella",
-    L"Euro-House",
-    L"Dance Hall",
-    L"Goa",
-    L"Drum & Bass",
-    L"Club-House",
-    L"Hardcore",
-    L"Terror",
-    L"Indie",
-    L"BritPop",
-    L"Negerpunk",
-    L"Polsk Punk",
-    L"Beat",
-    L"Christian Gangsta Rap",
-    L"Heavy Metal",
-    L"Black Metal",
-    L"Crossover",
-    L"Contemporary Christian",
-    L"Christian Rock",
-    L"Merengue",
-    L"Salsa",
-    L"Thrash Metal",
-    L"Anime",
-    L"Jpop",
-    L"Synthpop",
-    L"Abstract",
-    L"Art Rock",
-    L"Baroque",
-    L"Bhangra",
-    L"Big Beat",
-    L"Breakbeat",
-    L"Chillout",
-    L"Downtempo",
-    L"Dub",
-    L"EBM",
-    L"Eclectic",
-    L"Electro",
-    L"Electroclash",
-    L"Emo",
-    L"Experimental",
-    L"Garage",
-    L"Global",
-    L"IDM",
-    L"Illbient",
-    L"Industro-Goth",
-    L"Jam Band",
-    L"Krautrock",
-    L"Leftfield",
-    L"Lounge",
-    L"Math Rock",
-    L"New Romantic",
-    L"Nu-Breakz",
-    L"Post-Punk",
-    L"Post-Rock",
-    L"Psytrance",
-    L"Shoegaze",
-    L"Space Rock",
-    L"Trop Rock",
-    L"World Music",
-    L"Neoclassical",
-    L"Audiobook",
-    L"Audio Theatre",
-    L"Neue Deutsche Welle",
-    L"Podcast",
-    L"Indie Rock",
-    L"G-Funk",
-    L"Dubstep",
-    L"Garage Rock",
-    L"Psybient"
-  };
-  const int genresSize = sizeof(genres) / sizeof(genres[0]);
+namespace TagLib {
+  namespace ID3v1 {
+
+    static const int genresSize = 148;
+    static const String genres[] = {
+      "Blues",
+      "Classic Rock",
+      "Country",
+      "Dance",
+      "Disco",
+      "Funk",
+      "Grunge",
+      "Hip-Hop",
+      "Jazz",
+      "Metal",
+      "New Age",
+      "Oldies",
+      "Other",
+      "Pop",
+      "R&B",
+      "Rap",
+      "Reggae",
+      "Rock",
+      "Techno",
+      "Industrial",
+      "Alternative",
+      "Ska",
+      "Death Metal",
+      "Pranks",
+      "Soundtrack",
+      "Euro-Techno",
+      "Ambient",
+      "Trip-Hop",
+      "Vocal",
+      "Jazz+Funk",
+      "Fusion",
+      "Trance",
+      "Classical",
+      "Instrumental",
+      "Acid",
+      "House",
+      "Game",
+      "Sound Clip",
+      "Gospel",
+      "Noise",
+      "Alternative Rock",
+      "Bass",
+      "Soul",
+      "Punk",
+      "Space",
+      "Meditative",
+      "Instrumental Pop",
+      "Instrumental Rock",
+      "Ethnic",
+      "Gothic",
+      "Darkwave",
+      "Techno-Industrial",
+      "Electronic",
+      "Pop-Folk",
+      "Eurodance",
+      "Dream",
+      "Southern Rock",
+      "Comedy",
+      "Cult",
+      "Gangsta",
+      "Top 40",
+      "Christian Rap",
+      "Pop/Funk",
+      "Jungle",
+      "Native American",
+      "Cabaret",
+      "New Wave",
+      "Psychedelic",
+      "Rave",
+      "Showtunes",
+      "Trailer",
+      "Lo-Fi",
+      "Tribal",
+      "Acid Punk",
+      "Acid Jazz",
+      "Polka",
+      "Retro",
+      "Musical",
+      "Rock & Roll",
+      "Hard Rock",
+      "Folk",
+      "Folk/Rock",
+      "National Folk",
+      "Swing",
+      "Fusion",
+      "Bebob",
+      "Latin",
+      "Revival",
+      "Celtic",
+      "Bluegrass",
+      "Avantgarde",
+      "Gothic Rock",
+      "Progressive Rock",
+      "Psychedelic Rock",
+      "Symphonic Rock",
+      "Slow Rock",
+      "Big Band",
+      "Chorus",
+      "Easy Listening",
+      "Acoustic",
+      "Humour",
+      "Speech",
+      "Chanson",
+      "Opera",
+      "Chamber Music",
+      "Sonata",
+      "Symphony",
+      "Booty Bass",
+      "Primus",
+      "Porn Groove",
+      "Satire",
+      "Slow Jam",
+      "Club",
+      "Tango",
+      "Samba",
+      "Folklore",
+      "Ballad",
+      "Power Ballad",
+      "Rhythmic Soul",
+      "Freestyle",
+      "Duet",
+      "Punk Rock",
+      "Drum Solo",
+      "A Cappella",
+      "Euro-House",
+      "Dance Hall",
+      "Goa",
+      "Drum & Bass",
+      "Club-House",
+      "Hardcore",
+      "Terror",
+      "Indie",
+      "BritPop",
+      "Negerpunk",
+      "Polsk Punk",
+      "Beat",
+      "Christian Gangsta Rap",
+      "Heavy Metal",
+      "Black Metal",
+      "Crossover",
+      "Contemporary Christian",
+      "Christian Rock",
+      "Merengue",
+      "Salsa",
+      "Thrash Metal",
+      "Anime",
+      "Jpop",
+      "Synthpop"
+    };
+  }
 }
 
 StringList ID3v1::genreList()
 {
-  StringList l;
-  for(int i = 0; i < genresSize; i++) {
-    l.append(genres[i]);
+  static StringList l;
+  if(l.isEmpty()) {
+    for(int i = 0; i < genresSize; i++)
+      l.append(genres[i]);
   }
-
   return l;
 }
 
 ID3v1::GenreMap ID3v1::genreMap()
 {
-  GenreMap m;
-  for(int i = 0; i < genresSize; i++) {
-    m.insert(genres[i], i);
+  static GenreMap m;
+  if(m.isEmpty()) {
+    for(int i = 0; i < genresSize; i++)
+      m.insert(genres[i], i);
   }
-
   return m;
 }
 
 String ID3v1::genre(int i)
 {
   if(i >= 0 && i < genresSize)
-    return String(genres[i]); // always make a copy
-  else
-    return String();
+    return genres[i] + String::null; // always make a copy
+  return String::null;
 }
 
 int ID3v1::genreIndex(const String &name)
 {
-  for(int i = 0; i < genresSize; ++i) {
-    if(name == genres[i])
-      return i;
-  }
-
+  if(genreMap().contains(name))
+    return genreMap()[name];
   return 255;
 }

taglib/mpeg/id3v1/id3v1genres.h

@@ -49,7 +49,7 @@ namespace TagLib {
 
     /*!
      * Returns the name of the genre at \a index in the ID3v1 genre list.  If
-     * \a index is out of range -- less than zero or greater than 191 -- a null
+     * \a index is out of range -- less than zero or greater than 146 -- a null
      * string will be returned.
      */
     String TAGLIB_EXPORT genre(int index);

taglib/mpeg/id3v1/id3v1tag.cpp

@@ -32,20 +32,10 @@
 using namespace TagLib;
 using namespace ID3v1;
 
-namespace
-{
-  const ID3v1::StringHandler defaultStringHandler;
-  const ID3v1::StringHandler *stringHandler = &defaultStringHandler;
-}
-
 class ID3v1::Tag::TagPrivate
 {
 public:
-  TagPrivate() :
-    file(0),
-    tagOffset(0),
-    track(0),
-    genre(255) {}
+  TagPrivate() : file(0), tagOffset(-1), track(0), genre(255) {}
 
   File *file;
   long tagOffset;
@@ -55,18 +45,18 @@ public:
   String album;
   String year;
   String comment;
-  unsigned char track;
-  unsigned char genre;
+  uchar track;
+  uchar genre;
+
+  static const StringHandler *stringHandler;
 };
 
+const ID3v1::StringHandler *ID3v1::Tag::TagPrivate::stringHandler = new StringHandler;
+
 ////////////////////////////////////////////////////////////////////////////////
 // StringHandler implementation
 ////////////////////////////////////////////////////////////////////////////////
 
-StringHandler::StringHandler()
-{
-}
-
 String ID3v1::StringHandler::parse(const ByteVector &data) const
 {
   return String(data, String::Latin1).stripWhiteSpace();
@@ -74,26 +64,26 @@ String ID3v1::StringHandler::parse(const ByteVector &data) const
 
 ByteVector ID3v1::StringHandler::render(const String &s) const
 {
-  if(s.isLatin1())
-    return s.data(String::Latin1);
-  else
+  if(!s.isLatin1())
+  {
     return ByteVector();
+  }
+
+  return s.data(String::Latin1);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // public methods
 ////////////////////////////////////////////////////////////////////////////////
 
-ID3v1::Tag::Tag() :
-  TagLib::Tag(),
-  d(new TagPrivate())
+ID3v1::Tag::Tag() : TagLib::Tag()
 {
+  d = new TagPrivate;
 }
 
-ID3v1::Tag::Tag(File *file, long tagOffset) :
-  TagLib::Tag(),
-  d(new TagPrivate())
+ID3v1::Tag::Tag(File *file, long tagOffset) : TagLib::Tag()
 {
+  d = new TagPrivate;
   d->file = file;
   d->tagOffset = tagOffset;
 
@@ -110,11 +100,11 @@ ByteVector ID3v1::Tag::render() const
   ByteVector data;
 
   data.append(fileIdentifier());
-  data.append(stringHandler->render(d->title).resize(30));
-  data.append(stringHandler->render(d->artist).resize(30));
-  data.append(stringHandler->render(d->album).resize(30));
-  data.append(stringHandler->render(d->year).resize(4));
-  data.append(stringHandler->render(d->comment).resize(28));
+  data.append(TagPrivate::stringHandler->render(d->title).resize(30));
+  data.append(TagPrivate::stringHandler->render(d->artist).resize(30));
+  data.append(TagPrivate::stringHandler->render(d->album).resize(30));
+  data.append(TagPrivate::stringHandler->render(d->year).resize(4));
+  data.append(TagPrivate::stringHandler->render(d->comment).resize(28));
   data.append(char(0));
   data.append(char(d->track));
   data.append(char(d->genre));
@@ -152,12 +142,12 @@ String ID3v1::Tag::genre() const
   return ID3v1::genre(d->genre);
 }
 
-unsigned int ID3v1::Tag::year() const
+TagLib::uint ID3v1::Tag::year() const
 {
   return d->year.toInt();
 }
 
-unsigned int ID3v1::Tag::track() const
+TagLib::uint ID3v1::Tag::track() const
 {
   return d->track;
 }
@@ -187,32 +177,20 @@ void ID3v1::Tag::setGenre(const String &s)
   d->genre = ID3v1::genreIndex(s);
 }
 
-void ID3v1::Tag::setYear(unsigned int i)
+void ID3v1::Tag::setYear(uint i)
 {
-  d->year = i > 0 ? String::number(i) : String();
+  d->year = i > 0 ? String::number(i) : String::null;
 }
 
-void ID3v1::Tag::setTrack(unsigned int i)
+void ID3v1::Tag::setTrack(uint i)
 {
   d->track = i < 256 ? i : 0;
 }
 
-unsigned int ID3v1::Tag::genreNumber() const
-{
-  return d->genre;
-}
-
-void ID3v1::Tag::setGenreNumber(unsigned int i)
-{
-  d->genre = i < 256 ? i : 255;
-}
-
 void ID3v1::Tag::setStringHandler(const StringHandler *handler)
 {
-  if(handler)
-    stringHandler = handler;
-  else
-    stringHandler = &defaultStringHandler;
+  delete TagPrivate::stringHandler;
+  TagPrivate::stringHandler = handler;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -224,7 +202,7 @@ void ID3v1::Tag::read()
   if(d->file && d->file->isValid()) {
     d->file->seek(d->tagOffset);
     // read the tag -- always 128 bytes
-    const ByteVector data = d->file->readBlock(128);
+    ByteVector data = d->file->readBlock(128);
 
     // some initial sanity checking
     if(data.size() == 128 && data.startsWith("TAG"))
@@ -238,16 +216,16 @@ void ID3v1::Tag::parse(const ByteVector &data)
 {
   int offset = 3;
 
-  d->title = stringHandler->parse(data.mid(offset, 30));
+  d->title = TagPrivate::stringHandler->parse(data.mid(offset, 30));
   offset += 30;
 
-  d->artist = stringHandler->parse(data.mid(offset, 30));
+  d->artist = TagPrivate::stringHandler->parse(data.mid(offset, 30));
   offset += 30;
 
-  d->album = stringHandler->parse(data.mid(offset, 30));
+  d->album = TagPrivate::stringHandler->parse(data.mid(offset, 30));
   offset += 30;
 
-  d->year = stringHandler->parse(data.mid(offset, 4));
+  d->year = TagPrivate::stringHandler->parse(data.mid(offset, 4));
   offset += 4;
 
   // Check for ID3v1.1 -- Note that ID3v1 *does not* support "track zero" -- this
@@ -258,13 +236,13 @@ void ID3v1::Tag::parse(const ByteVector &data)
   if(data[offset + 28] == 0 && data[offset + 29] != 0) {
     // ID3v1.1 detected
 
-    d->comment = stringHandler->parse(data.mid(offset, 28));
-    d->track   = static_cast<unsigned char>(data[offset + 29]);
+    d->comment = TagPrivate::stringHandler->parse(data.mid(offset, 28));
+    d->track = uchar(data[offset + 29]);
   }
   else
     d->comment = data.mid(offset, 30);
 
   offset += 30;
 
-  d->genre = static_cast<unsigned char>(data[offset]);
+  d->genre = uchar(data[offset]);
 }

taglib/mpeg/id3v1/id3v1tag.h

@@ -62,7 +62,6 @@ namespace TagLib {
       TAGLIB_IGNORE_MISSING_DESTRUCTOR
     public:
       // BIC: Add virtual destructor.
-      StringHandler();
 
       /*!
        * Decode a string from \a data.  The default implementation assumes that
@@ -85,7 +84,7 @@ namespace TagLib {
     //! The main class in the ID3v1 implementation
 
     /*!
-     * This is an implementation of the ID3v1 format.  ID3v1 is both the simplest
+     * This is an implementation of the ID3v1 format.  ID3v1 is both the simplist
      * and most common of tag formats but is rather limited.  Because of its
      * pervasiveness and the way that applications have been written around the
      * fields that it provides, the generic TagLib::Tag API is a mirror of what is
@@ -140,40 +139,20 @@ namespace TagLib {
       virtual String album() const;
       virtual String comment() const;
       virtual String genre() const;
-      virtual unsigned int year() const;
-      virtual unsigned int track() const;
+      virtual uint year() const;
+      virtual uint track() const;
 
       virtual void setTitle(const String &s);
       virtual void setArtist(const String &s);
       virtual void setAlbum(const String &s);
       virtual void setComment(const String &s);
       virtual void setGenre(const String &s);
-      virtual void setYear(unsigned int i);
-      virtual void setTrack(unsigned int i);
-
-      /*!
-       * Returns the genre in number.
-       *
-       * \note Normally 255 indicates that this tag contains no genre.
-       */
-      unsigned int genreNumber() const;
-
-      /*!
-       * Sets the genre in number to \a i.
-       *
-       * \note Valid value is from 0 up to 255. Normally 255 indicates that
-       * this tag contains no genre.
-       */
-      void setGenreNumber(unsigned int i);
+      virtual void setYear(uint i);
+      virtual void setTrack(uint i);
 
       /*!
        * Sets the string handler that decides how the ID3v1 data will be
        * converted to and from binary data.
-       * If the parameter \a handler is null, the previous handler is
-       * released and default ISO-8859-1 handler is restored.
-       *
-       * \note The caller is responsible for deleting the previous handler
-       * as needed after it is released.
        *
        * \see StringHandler
        */

taglib/mpeg/id3v2/frames/attachedpictureframe.cpp

@@ -137,7 +137,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data)
 
   d->mimeType = readStringField(data, String::Latin1, &pos);
   /* Now we need at least two more bytes available */
-  if(static_cast<unsigned int>(pos) + 1 >= data.size()) {
+  if (uint(pos) + 1 >= data.size()) {
     debug("Truncated picture frame.");
     return;
   }

taglib/mpeg/id3v2/frames/chapterframe.cpp

@@ -1,306 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2013 by Lukas Krejci
-    email                : krejclu6@fel.cvut.cz
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <tbytevectorlist.h>
-#include <tpropertymap.h>
-#include <tdebug.h>
-#include <stdio.h>
-
-#include "chapterframe.h"
-
-using namespace TagLib;
-using namespace ID3v2;
-
-class ChapterFrame::ChapterFramePrivate
-{
-public:
-  ChapterFramePrivate() :
-    tagHeader(0)
-  {
-    embeddedFrameList.setAutoDelete(true);
-  }
-
-  const ID3v2::Header *tagHeader;
-  ByteVector elementID;
-  unsigned int startTime;
-  unsigned int endTime;
-  unsigned int startOffset;
-  unsigned int endOffset;
-  FrameListMap embeddedFrameListMap;
-  FrameList embeddedFrameList;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public methods
-////////////////////////////////////////////////////////////////////////////////
-
-ChapterFrame::ChapterFrame(const ID3v2::Header *tagHeader, const ByteVector &data) :
-    ID3v2::Frame(data)
-{
-  d = new ChapterFramePrivate;
-  d->tagHeader = tagHeader;
-  setData(data);
-}
-
-ChapterFrame::ChapterFrame(const ByteVector &elementID,
-                           unsigned int startTime, unsigned int endTime,
-                           unsigned int startOffset, unsigned int endOffset,
-                           const FrameList &embeddedFrames) :
-    ID3v2::Frame("CHAP")
-{
-  d = new ChapterFramePrivate;
-
-  // setElementID has a workaround for a previously silly API where you had to
-  // specifically include the null byte.
-
-  setElementID(elementID);
-
-  d->startTime = startTime;
-  d->endTime = endTime;
-  d->startOffset = startOffset;
-  d->endOffset = endOffset;
-
-  for(FrameList::ConstIterator it = embeddedFrames.begin();
-      it != embeddedFrames.end(); ++it)
-    addEmbeddedFrame(*it);
-}
-
-ChapterFrame::~ChapterFrame()
-{
-  delete d;
-}
-
-ByteVector ChapterFrame::elementID() const
-{
-  return d->elementID;
-}
-
-unsigned int ChapterFrame::startTime() const
-{
-  return d->startTime;
-}
-
-unsigned int ChapterFrame::endTime() const
-{
-  return d->endTime;
-}
-
-unsigned int ChapterFrame::startOffset() const
-{
-  return d->startOffset;
-}
-
-unsigned int ChapterFrame::endOffset() const
-{
-  return d->endOffset;
-}
-
-void ChapterFrame::setElementID(const ByteVector &eID)
-{
-  d->elementID = eID;
-
-  if(d->elementID.endsWith(char(0)))
-    d->elementID = d->elementID.mid(0, d->elementID.size() - 1);
-}
-
-void ChapterFrame::setStartTime(const unsigned int &sT)
-{
-  d->startTime = sT;
-}
-
-void ChapterFrame::setEndTime(const unsigned int &eT)
-{
-  d->endTime = eT;
-}
-
-void ChapterFrame::setStartOffset(const unsigned int &sO)
-{
-  d->startOffset = sO;
-}
-
-void ChapterFrame::setEndOffset(const unsigned int &eO)
-{
-  d->endOffset = eO;
-}
-
-const FrameListMap &ChapterFrame::embeddedFrameListMap() const
-{
-  return d->embeddedFrameListMap;
-}
-
-const FrameList &ChapterFrame::embeddedFrameList() const
-{
-  return d->embeddedFrameList;
-}
-
-const FrameList &ChapterFrame::embeddedFrameList(const ByteVector &frameID) const
-{
-  return d->embeddedFrameListMap[frameID];
-}
-
-void ChapterFrame::addEmbeddedFrame(Frame *frame)
-{
-  d->embeddedFrameList.append(frame);
-  d->embeddedFrameListMap[frame->frameID()].append(frame);
-}
-
-void ChapterFrame::removeEmbeddedFrame(Frame *frame, bool del)
-{
-  // remove the frame from the frame list
-  FrameList::Iterator it = d->embeddedFrameList.find(frame);
-  d->embeddedFrameList.erase(it);
-
-  // ...and from the frame list map
-  it = d->embeddedFrameListMap[frame->frameID()].find(frame);
-  d->embeddedFrameListMap[frame->frameID()].erase(it);
-
-  // ...and delete as desired
-  if(del)
-    delete frame;
-}
-
-void ChapterFrame::removeEmbeddedFrames(const ByteVector &id)
-{
-  FrameList l = d->embeddedFrameListMap[id];
-  for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
-    removeEmbeddedFrame(*it, true);
-}
-
-String ChapterFrame::toString() const
-{
-  String s = String(d->elementID) +
-             ": start time: " + String::number(d->startTime) +
-             ", end time: " + String::number(d->endTime);
-
-  if(d->startOffset != 0xFFFFFFFF)
-    s += ", start offset: " + String::number(d->startOffset);
-
-  if(d->endOffset != 0xFFFFFFFF)
-    s += ", start offset: " + String::number(d->endOffset);
-
-  if(!d->embeddedFrameList.isEmpty()) {
-    StringList frameIDs;
-    for(FrameList::ConstIterator it = d->embeddedFrameList.begin();
-        it != d->embeddedFrameList.end(); ++it)
-      frameIDs.append((*it)->frameID());
-    s += ", sub-frames: [ " + frameIDs.toString(", ") + " ]";
-  }
-
-  return s;
-}
-
-PropertyMap ChapterFrame::asProperties() const
-{
-  PropertyMap map;
-
-  map.unsupportedData().append(frameID() + String("/") + d->elementID);
-
-  return map;
-}
-
-ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVector &eID) // static
-{
-  ID3v2::FrameList comments = tag->frameList("CHAP");
-
-  for(ID3v2::FrameList::ConstIterator it = comments.begin();
-      it != comments.end();
-      ++it)
-  {
-    ChapterFrame *frame = dynamic_cast<ChapterFrame *>(*it);
-    if(frame && frame->elementID() == eID)
-      return frame;
-  }
-
-  return 0;
-}
-
-void ChapterFrame::parseFields(const ByteVector &data)
-{
-  unsigned int size = data.size();
-  if(size < 18) {
-    debug("A CHAP frame must contain at least 18 bytes (1 byte element ID "
-          "terminated by null and 4x4 bytes for start and end time and offset).");
-    return;
-  }
-
-  int pos = 0;
-  unsigned int embPos = 0;
-  d->elementID = readStringField(data, String::Latin1, &pos).data(String::Latin1);
-  d->startTime = data.toUInt(pos, true);
-  pos += 4;
-  d->endTime = data.toUInt(pos, true);
-  pos += 4;
-  d->startOffset = data.toUInt(pos, true);
-  pos += 4;
-  d->endOffset = data.toUInt(pos, true);
-  pos += 4;
-  size -= pos;
-
-  // Embedded frames are optional
-
-  if(size < header()->size())
-    return;
-
-  while(embPos < size - header()->size()) {
-    Frame *frame = FrameFactory::instance()->createFrame(data.mid(pos + embPos), (d->tagHeader != 0));
-
-    if(!frame)
-      return;
-
-    // Checks to make sure that frame parsed correctly.
-    if(frame->size() <= 0) {
-      delete frame;
-      return;
-    }
-
-    embPos += frame->size() + header()->size();
-    addEmbeddedFrame(frame);
-  }
-}
-
-ByteVector ChapterFrame::renderFields() const
-{
-  ByteVector data;
-
-  data.append(d->elementID);
-  data.append('\0');
-  data.append(ByteVector::fromUInt(d->startTime, true));
-  data.append(ByteVector::fromUInt(d->endTime, true));
-  data.append(ByteVector::fromUInt(d->startOffset, true));
-  data.append(ByteVector::fromUInt(d->endOffset, true));
-  FrameList l = d->embeddedFrameList;
-  for(FrameList::ConstIterator it = l.begin(); it != l.end(); ++it)
-    data.append((*it)->render());
-
-  return data;
-}
-
-ChapterFrame::ChapterFrame(const ID3v2::Header *tagHeader, const ByteVector &data, Header *h) :
-  Frame(h)
-{
-  d = new ChapterFramePrivate;
-  d->tagHeader = tagHeader;
-  parseFields(fieldData(data));
-}

taglib/mpeg/id3v2/frames/chapterframe.h

@@ -1,249 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2013 by Lukas Krejci
-    email                : krejclu6@fel.cvut.cz
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_CHAPTERFRAME
-#define TAGLIB_CHAPTERFRAME
-
-#include "id3v2tag.h"
-#include "id3v2frame.h"
-#include "taglib_export.h"
-
-namespace TagLib {
-
-  namespace ID3v2 {
-
-    /*!
-     * This is an implementation of ID3v2 chapter frames.  The purpose of this
-     * frame is to describe a single chapter within an audio file.
-     */
-
-    //! An implementation of ID3v2 chapter frames
-
-    class TAGLIB_EXPORT ChapterFrame : public ID3v2::Frame
-    {
-      friend class FrameFactory;
-
-    public:
-      /*!
-       * Creates a chapter frame based on \a data.  \a tagHeader is required as
-       * the internal frames are parsed based on the tag version.
-       */
-      ChapterFrame(const ID3v2::Header *tagHeader, const ByteVector &data);
-
-      /*!
-       * Creates a chapter frame with the element ID \a elementID, start time
-       * \a startTime, end time \a endTime, start offset \a startOffset,
-       * end offset \a endOffset and optionally a list of embedded frames,
-       * whose ownership will then be taken over by this Frame, in
-       * \a embeededFrames;
-       *
-       * All times are in milliseconds.
-       */
-      ChapterFrame(const ByteVector &elementID,
-                   unsigned int startTime, unsigned int endTime,
-                   unsigned int startOffset, unsigned int endOffset,
-                   const FrameList &embeddedFrames = FrameList());
-
-      /*!
-       * Destroys the frame.
-       */
-      virtual ~ChapterFrame();
-
-      /*!
-       * Returns the element ID of the frame. Element ID
-       * is a null terminated string, however it's not human-readable.
-       *
-       * \see setElementID()
-       */
-      ByteVector elementID() const;
-
-      /*!
-       * Returns time of chapter's start (in milliseconds).
-       *
-       * \see setStartTime()
-       */
-      unsigned int startTime() const;
-
-      /*!
-       * Returns time of chapter's end (in milliseconds).
-       *
-       * \see setEndTime()
-       */
-      unsigned int endTime() const;
-
-      /*!
-       * Returns zero based byte offset (count of bytes from the beginning
-       * of the audio file) of chapter's start.
-       *
-       * \note If returned value is 0xFFFFFFFF, start time should be used instead.
-       * \see setStartOffset()
-       */
-      unsigned int startOffset() const;
-
-      /*!
-       * Returns zero based byte offset (count of bytes from the beginning
-       * of the audio file) of chapter's end.
-       *
-       * \note If returned value is 0xFFFFFFFF, end time should be used instead.
-       * \see setEndOffset()
-       */
-      unsigned int endOffset() const;
-
-      /*!
-       * Sets the element ID of the frame to \a eID. If \a eID isn't
-       * null terminated, a null char is appended automatically.
-       *
-       * \see elementID()
-       */
-      void setElementID(const ByteVector &eID);
-
-      /*!
-       * Sets time of chapter's start (in milliseconds) to \a sT.
-       *
-       * \see startTime()
-       */
-      void setStartTime(const unsigned int &sT);
-
-      /*!
-       * Sets time of chapter's end (in milliseconds) to \a eT.
-       *
-       * \see endTime()
-       */
-      void setEndTime(const unsigned int &eT);
-
-      /*!
-       * Sets zero based byte offset (count of bytes from the beginning
-       * of the audio file) of chapter's start to \a sO.
-       *
-       * \see startOffset()
-       */
-      void setStartOffset(const unsigned int &sO);
-
-      /*!
-       * Sets zero based byte offset (count of bytes from the beginning
-       * of the audio file) of chapter's end to \a eO.
-       *
-       * \see endOffset()
-       */
-      void setEndOffset(const unsigned int &eO);
-
-      /*!
-       * Returns a reference to the frame list map.  This is an FrameListMap of
-       * all of the frames embedded in the CHAP frame.
-       *
-       * This is the most convenient structure for accessing the CHAP frame's
-       * embedded frames. Many frame types allow multiple instances of the same
-       * frame type so this is a map of lists. In most cases however there will
-       * only be a single frame of a certain type.
-       *
-       * \warning You should not modify this data structure directly, instead
-       * use addEmbeddedFrame() and removeEmbeddedFrame().
-       *
-       * \see embeddedFrameList()
-       */
-      const FrameListMap &embeddedFrameListMap() const;
-
-      /*!
-       * Returns a reference to the embedded frame list.  This is an FrameList
-       * of all of the frames embedded in the CHAP frame in the order that they
-       * were parsed.
-       *
-       * This can be useful if for example you want iterate over the CHAP frame's
-       * embedded frames in the order that they occur in the CHAP frame.
-       *
-       * \warning You should not modify this data structure directly, instead
-       * use addEmbeddedFrame() and removeEmbeddedFrame().
-       */
-      const FrameList &embeddedFrameList() const;
-
-      /*!
-       * Returns the embedded frame list for frames with the id \a frameID
-       * or an empty list if there are no embedded frames of that type.  This
-       * is just a convenience and is equivalent to:
-       *
-       * \code
-       * embeddedFrameListMap()[frameID];
-       * \endcode
-       *
-       * \see embeddedFrameListMap()
-       */
-      const FrameList &embeddedFrameList(const ByteVector &frameID) const;
-
-      /*!
-       * Add an embedded frame to the CHAP frame.  At this point the CHAP frame
-       * takes ownership of the embedded frame and will handle freeing its memory.
-       *
-       * \note Using this method will invalidate any pointers on the list
-       * returned by embeddedFrameList()
-       */
-      void addEmbeddedFrame(Frame *frame);
-
-      /*!
-       * Remove an embedded frame from the CHAP frame.  If \a del is true the frame's
-       * memory will be freed; if it is false, it must be deleted by the user.
-       *
-       * \note Using this method will invalidate any pointers on the list
-       * returned by embeddedFrameList()
-       */
-      void removeEmbeddedFrame(Frame *frame, bool del = true);
-
-      /*!
-       * Remove all embedded frames of type \a id from the CHAP frame and free their
-       * memory.
-       *
-       * \note Using this method will invalidate any pointers on the list
-       * returned by embeddedFrameList()
-       */
-      void removeEmbeddedFrames(const ByteVector &id);
-
-      virtual String toString() const;
-
-      PropertyMap asProperties() const;
-
-      /*!
-       * CHAP frames each have a unique element ID. This searches for a CHAP
-       * frame with the element ID \a eID and returns a pointer to it. This
-       * can be used to link CTOC and CHAP frames together.
-       *
-       * \see elementID()
-       */
-      static ChapterFrame *findByElementID(const Tag *tag, const ByteVector &eID);
-
-    protected:
-      virtual void parseFields(const ByteVector &data);
-      virtual ByteVector renderFields() const;
-
-    private:
-      ChapterFrame(const ID3v2::Header *tagHeader, const ByteVector &data, Header *h);
-      ChapterFrame(const ChapterFrame &);
-      ChapterFrame &operator=(const ChapterFrame &);
-
-      class ChapterFramePrivate;
-      ChapterFramePrivate *d;
-    };
-  }
-}
-
-#endif

taglib/mpeg/id3v2/frames/commentsframe.cpp

@@ -29,7 +29,6 @@
 #include <tstringlist.h>
 
 #include "commentsframe.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -110,17 +109,6 @@ void CommentsFrame::setTextEncoding(String::Type encoding)
   d->textEncoding = encoding;
 }
 
-PropertyMap CommentsFrame::asProperties() const
-{
-  String key = description().upper();
-  PropertyMap map;
-  if(key.isEmpty() || key == "COMMENT")
-    map.insert("COMMENT", text());
-  else
-    map.insert("COMMENT:" + key, text());
-  return map;
-}
-
 CommentsFrame *CommentsFrame::findByDescription(const ID3v2::Tag *tag, const String &d) // static
 {
   ID3v2::FrameList comments = tag->frameList("COMM");
@@ -156,13 +144,8 @@ void CommentsFrame::parseFields(const ByteVector &data)
   ByteVectorList l = ByteVectorList::split(data.mid(4), textDelimiter(d->textEncoding), byteAlign, 2);
 
   if(l.size() == 2) {
-    if(d->textEncoding == String::Latin1) {
-      d->description = Tag::latin1StringHandler()->parse(l.front());
-      d->text = Tag::latin1StringHandler()->parse(l.back());
-    } else {
-      d->description = String(l.front(), d->textEncoding);
-      d->text = String(l.back(), d->textEncoding);
-    }
+    d->description = String(l.front(), d->textEncoding);
+    d->text = String(l.back(), d->textEncoding);
   }
 }
 

taglib/mpeg/id3v2/frames/commentsframe.h

@@ -36,7 +36,7 @@ namespace TagLib {
     //! An implementation of ID3v2 comments
 
     /*!
-     * This implements the ID3v2 comment format.  An ID3v2 comment consists of
+     * This implements the ID3v2 comment format.  An ID3v2 comment concists of
      * a language encoding, a description and a single text field.
      */
 
@@ -106,7 +106,7 @@ namespace TagLib {
       /*!
        * Sets the description of the comment to \a s.
        *
-       * \see description()
+       * \see decription()
        */
       void setDescription(const String &s);
 
@@ -136,20 +136,9 @@ namespace TagLib {
        */
       void setTextEncoding(String::Type encoding);
 
-      /*!
-       * Parses this frame as PropertyMap with a single key.
-       * - if description() is empty or "COMMENT", the key will be "COMMENT"
-       * - if description() is not a valid PropertyMap key, the frame will be
-       *   marked unsupported by an entry "COMM/<description>" in the unsupportedData()
-       *   attribute of the returned map.
-       * - otherwise, the key will be "COMMENT:<description>"
-       * - The single value will be the frame's text().
-       */
-      PropertyMap asProperties() const;
-
       /*!
        * Comments each have a unique description.  This searches for a comment
-       * frame with the description \a d and returns a pointer to it.  If no
+       * frame with the decription \a d and returns a pointer to it.  If no
        * frame is found that matches the given description null is returned.
        *
        * \see description()

taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp

@@ -1,144 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2014 by Urs Fleisch
-    email                : ufleisch@users.sourceforge.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it  under the terms of the GNU Lesser General Public License version  *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "eventtimingcodesframe.h"
-#include <tbytevectorlist.h>
-#include <id3v2tag.h>
-#include <tdebug.h>
-#include <tpropertymap.h>
-
-using namespace TagLib;
-using namespace ID3v2;
-
-class EventTimingCodesFrame::EventTimingCodesFramePrivate
-{
-public:
-  EventTimingCodesFramePrivate() :
-    timestampFormat(EventTimingCodesFrame::AbsoluteMilliseconds) {}
-  EventTimingCodesFrame::TimestampFormat timestampFormat;
-  EventTimingCodesFrame::SynchedEventList synchedEvents;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-EventTimingCodesFrame::EventTimingCodesFrame() :
-  Frame("ETCO")
-{
-  d = new EventTimingCodesFramePrivate;
-}
-
-EventTimingCodesFrame::EventTimingCodesFrame(const ByteVector &data) :
-  Frame(data)
-{
-  d = new EventTimingCodesFramePrivate;
-  setData(data);
-}
-
-EventTimingCodesFrame::~EventTimingCodesFrame()
-{
-  delete d;
-}
-
-String EventTimingCodesFrame::toString() const
-{
-  return String();
-}
-
-EventTimingCodesFrame::TimestampFormat
-EventTimingCodesFrame::timestampFormat() const
-{
-  return d->timestampFormat;
-}
-
-EventTimingCodesFrame::SynchedEventList
-EventTimingCodesFrame::synchedEvents() const
-{
-  return d->synchedEvents;
-}
-
-void EventTimingCodesFrame::setTimestampFormat(
-    EventTimingCodesFrame::TimestampFormat f)
-{
-  d->timestampFormat = f;
-}
-
-void EventTimingCodesFrame::setSynchedEvents(
-    const EventTimingCodesFrame::SynchedEventList &e)
-{
-  d->synchedEvents = e;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// protected members
-////////////////////////////////////////////////////////////////////////////////
-
-void EventTimingCodesFrame::parseFields(const ByteVector &data)
-{
-  const int end = data.size();
-  if(end < 1) {
-    debug("An event timing codes frame must contain at least 1 byte.");
-    return;
-  }
-
-  d->timestampFormat = TimestampFormat(data[0]);
-
-  int pos = 1;
-  d->synchedEvents.clear();
-  while(pos + 4 < end) {
-    EventType type = static_cast<EventType>(static_cast<unsigned char>(data[pos++]));
-    unsigned int time = data.toUInt(pos, true);
-    pos += 4;
-    d->synchedEvents.append(SynchedEvent(time, type));
-  }
-}
-
-ByteVector EventTimingCodesFrame::renderFields() const
-{
-  ByteVector v;
-
-  v.append(char(d->timestampFormat));
-  for(SynchedEventList::ConstIterator it = d->synchedEvents.begin();
-      it != d->synchedEvents.end();
-      ++it) {
-    const SynchedEvent &entry = *it;
-    v.append(char(entry.type));
-    v.append(ByteVector::fromUInt(entry.time));
-  }
-
-  return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-EventTimingCodesFrame::EventTimingCodesFrame(const ByteVector &data, Header *h)
-  : Frame(h)
-{
-  d = new EventTimingCodesFramePrivate();
-  parseFields(fieldData(data));
-}

taglib/mpeg/id3v2/frames/eventtimingcodesframe.h

@@ -1,185 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2014 by Urs Fleisch
-    email                : ufleisch@users.sourceforge.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it  under the terms of the GNU Lesser General Public License version  *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_EVENTTIMINGCODESFRAME_H
-#define TAGLIB_EVENTTIMINGCODESFRAME_H
-
-#include "id3v2frame.h"
-#include "tlist.h"
-
-namespace TagLib {
-
-  namespace ID3v2 {
-
-    //! ID3v2 event timing codes frame
-    /*!
-     * An implementation of ID3v2 event timing codes.
-     */
-    class TAGLIB_EXPORT EventTimingCodesFrame : public Frame
-    {
-      friend class FrameFactory;
-
-    public:
-
-      /*!
-       * Specifies the timestamp format used.
-       */
-      enum TimestampFormat {
-        //! The timestamp is of unknown format.
-        Unknown              = 0x00,
-        //! The timestamp represents the number of MPEG frames since
-        //! the beginning of the audio stream.
-        AbsoluteMpegFrames   = 0x01,
-        //! The timestamp represents the number of milliseconds since
-        //! the beginning of the audio stream.
-        AbsoluteMilliseconds = 0x02
-      };
-
-      /*!
-       * Event types defined in id3v2.4.0-frames.txt 4.5. Event timing codes.
-       */
-      enum EventType {
-        Padding                = 0x00,
-        EndOfInitialSilence    = 0x01,
-        IntroStart             = 0x02,
-        MainPartStart          = 0x03,
-        OutroStart             = 0x04,
-        OutroEnd               = 0x05,
-        VerseStart             = 0x06,
-        RefrainStart           = 0x07,
-        InterludeStart         = 0x08,
-        ThemeStart             = 0x09,
-        VariationStart         = 0x0a,
-        KeyChange              = 0x0b,
-        TimeChange             = 0x0c,
-        MomentaryUnwantedNoise = 0x0d,
-        SustainedNoise         = 0x0e,
-        SustainedNoiseEnd      = 0x0f,
-        IntroEnd               = 0x10,
-        MainPartEnd            = 0x11,
-        VerseEnd               = 0x12,
-        RefrainEnd             = 0x13,
-        ThemeEnd               = 0x14,
-        Profanity              = 0x15,
-        ProfanityEnd           = 0x16,
-        NotPredefinedSynch0    = 0xe0,
-        NotPredefinedSynch1    = 0xe1,
-        NotPredefinedSynch2    = 0xe2,
-        NotPredefinedSynch3    = 0xe3,
-        NotPredefinedSynch4    = 0xe4,
-        NotPredefinedSynch5    = 0xe5,
-        NotPredefinedSynch6    = 0xe6,
-        NotPredefinedSynch7    = 0xe7,
-        NotPredefinedSynch8    = 0xe8,
-        NotPredefinedSynch9    = 0xe9,
-        NotPredefinedSynchA    = 0xea,
-        NotPredefinedSynchB    = 0xeb,
-        NotPredefinedSynchC    = 0xec,
-        NotPredefinedSynchD    = 0xed,
-        NotPredefinedSynchE    = 0xee,
-        NotPredefinedSynchF    = 0xef,
-        AudioEnd               = 0xfd,
-        AudioFileEnds          = 0xfe
-      };
-
-      /*!
-       * Single entry of time stamp and event.
-       */
-      struct SynchedEvent {
-        SynchedEvent(unsigned int ms, EventType t) : time(ms), type(t) {}
-        unsigned int time;
-        EventType type;
-      };
-
-      /*!
-       * List of synchronized events.
-       */
-      typedef TagLib::List<SynchedEvent> SynchedEventList;
-
-      /*!
-       * Construct an empty event timing codes frame.
-       */
-      explicit EventTimingCodesFrame();
-
-      /*!
-       * Construct a event timing codes frame based on the data in \a data.
-       */
-      explicit EventTimingCodesFrame(const ByteVector &data);
-
-      /*!
-       * Destroys this EventTimingCodesFrame instance.
-       */
-      virtual ~EventTimingCodesFrame();
-
-      /*!
-       * Returns a null string.
-       */
-      virtual String toString() const;
-
-      /*!
-       * Returns the timestamp format.
-       */
-      TimestampFormat timestampFormat() const;
-
-      /*!
-       * Returns the events with the time stamps.
-       */
-      SynchedEventList synchedEvents() const;
-
-      /*!
-       * Set the timestamp format.
-       *
-       * \see timestampFormat()
-       */
-      void setTimestampFormat(TimestampFormat f);
-
-      /*!
-       * Sets the text with the time stamps.
-       *
-       * \see text()
-       */
-      void setSynchedEvents(const SynchedEventList &e);
-
-    protected:
-      // Reimplementations.
-
-      virtual void parseFields(const ByteVector &data);
-      virtual ByteVector renderFields() const;
-
-    private:
-      /*!
-       * The constructor used by the FrameFactory.
-       */
-      EventTimingCodesFrame(const ByteVector &data, Header *h);
-      EventTimingCodesFrame(const EventTimingCodesFrame &);
-      EventTimingCodesFrame &operator=(const EventTimingCodesFrame &);
-
-      class EventTimingCodesFramePrivate;
-      EventTimingCodesFramePrivate *d;
-    };
-
-  }
-}
-#endif

taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp

@@ -1,7 +1,6 @@
 /***************************************************************************
     copyright            : (C) 2002 - 2008 by Scott Wheeler
     email                : wheeler@kde.org
-
     copyright            : (C) 2006 by Aaron VonderHaar
     email                : avh4@users.sourceforge.net
  ***************************************************************************/
@@ -27,7 +26,6 @@
  ***************************************************************************/
 
 #include <tdebug.h>
-#include <tstringlist.h>
 
 #include "generalencapsulatedobjectframe.h"
 
@@ -153,21 +151,15 @@ void GeneralEncapsulatedObjectFrame::parseFields(const ByteVector &data)
 
 ByteVector GeneralEncapsulatedObjectFrame::renderFields() const
 {
-  StringList sl;
-  sl.append(d->fileName);
-  sl.append(d->description);
-
-  const String::Type encoding = checkTextEncoding(sl, d->textEncoding);
-
   ByteVector data;
 
-  data.append(char(encoding));
+  data.append(char(d->textEncoding));
   data.append(d->mimeType.data(String::Latin1));
   data.append(textDelimiter(String::Latin1));
-  data.append(d->fileName.data(encoding));
-  data.append(textDelimiter(encoding));
-  data.append(d->description.data(encoding));
-  data.append(textDelimiter(encoding));
+  data.append(d->fileName.data(d->textEncoding));
+  data.append(textDelimiter(d->textEncoding));
+  data.append(d->description.data(d->textEncoding));
+  data.append(textDelimiter(d->textEncoding));
   data.append(d->data);
 
   return data;

taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h

@@ -1,7 +1,6 @@
 /***************************************************************************
     copyright            : (C) 2002 - 2008 by Scott Wheeler
     email                : wheeler@kde.org
-
     copyright            : (C) 2006 by Aaron VonderHaar
     email                : avh4@users.sourceforge.net
  ***************************************************************************/

taglib/mpeg/id3v2/frames/ownershipframe.cpp

@@ -1,168 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2012 by Rupert Daniel
-    email                : rupert@cancelmonday.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include <tdebug.h>
-#include <tstringlist.h>
-#include <id3v2tag.h>
-
-#include "ownershipframe.h"
-
-using namespace TagLib;
-using namespace ID3v2;
-
-class OwnershipFrame::OwnershipFramePrivate
-{
-public:
-  String pricePaid;
-  String datePurchased;
-  String seller;
-  String::Type textEncoding;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-OwnershipFrame::OwnershipFrame(String::Type encoding) : Frame("OWNE")
-{
-  d = new OwnershipFramePrivate;
-  d->textEncoding = encoding;
-}
-
-OwnershipFrame::OwnershipFrame(const ByteVector &data) : Frame(data)
-{
-  d = new OwnershipFramePrivate;
-  setData(data);
-}
-
-OwnershipFrame::~OwnershipFrame()
-{
-  delete d;
-}
-
-String OwnershipFrame::toString() const
-{
-  return "pricePaid=" + d->pricePaid + " datePurchased=" + d->datePurchased + " seller=" + d->seller;
-}
-
-String OwnershipFrame::pricePaid() const
-{
-  return d->pricePaid;
-}
-
-void OwnershipFrame::setPricePaid(const String &s)
-{
-  d->pricePaid = s;
-}
-
-String OwnershipFrame::datePurchased() const
-{
-  return d->datePurchased;
-}
-
-void OwnershipFrame::setDatePurchased(const String &s)
-{
-  d->datePurchased = s;
-}
-
-String OwnershipFrame::seller() const
-{
-  return d->seller;
-}
-
-void OwnershipFrame::setSeller(const String &s)
-{
-  d->seller = s;
-}
-
-String::Type OwnershipFrame::textEncoding() const
-{
-  return d->textEncoding;
-}
-
-void OwnershipFrame::setTextEncoding(String::Type encoding)
-{
-  d->textEncoding = encoding;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// protected members
-////////////////////////////////////////////////////////////////////////////////
-
-void OwnershipFrame::parseFields(const ByteVector &data)
-{
-  int pos = 0;
-
-  // Get the text encoding
-  d->textEncoding = String::Type(data[0]);
-  pos += 1;
-
-  // Read the price paid this is a null terminate string
-  d->pricePaid = readStringField(data, String::Latin1, &pos);
-
-  // If we don't have at least 8 bytes left then don't parse the rest of the
-  // data
-  if(data.size() - pos < 8) {
-    return;
-  }
-
-  // Read the date purchased YYYYMMDD
-  d->datePurchased = String(data.mid(pos, 8));
-  pos += 8;
-
-  // Read the seller
-  if(d->textEncoding == String::Latin1)
-    d->seller = Tag::latin1StringHandler()->parse(data.mid(pos));
-  else
-    d->seller = String(data.mid(pos), d->textEncoding);
-}
-
-ByteVector OwnershipFrame::renderFields() const
-{
-  StringList sl;
-  sl.append(d->seller);
-
-  const String::Type encoding = checkTextEncoding(sl, d->textEncoding);
-
-  ByteVector v;
-
-  v.append(char(encoding));
-  v.append(d->pricePaid.data(String::Latin1));
-  v.append(textDelimiter(String::Latin1));
-  v.append(d->datePurchased.data(String::Latin1));
-  v.append(d->seller.data(encoding));
-
-  return v;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-OwnershipFrame::OwnershipFrame(const ByteVector &data, Header *h) : Frame(h)
-{
-  d = new OwnershipFramePrivate;
-  parseFields(fieldData(data));
-}

taglib/mpeg/id3v2/frames/ownershipframe.h

@@ -1,151 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2012 by Rupert Daniel
-    email                : rupert@cancelmonday.com
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU Lesser General Public License version   *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#ifndef TAGLIB_OWNERSHIPFRAME_H
-#define TAGLIB_OWNERSHIPFRAME_H
-
-#include "id3v2frame.h"
-#include "taglib_export.h"
-
-namespace TagLib {
-
-  namespace ID3v2 {
-
-    //! An implementation of ID3v2 "ownership"
-
-    /*!
-     * This implements the ID3v2 ownership (OWNE frame).  It consists of
-     * a price paid, a date purchased (YYYYMMDD) and the name of the seller.
-     */
-
-    class TAGLIB_EXPORT OwnershipFrame : public Frame
-    {
-      friend class FrameFactory;
-
-    public:
-      /*!
-       * Construct an empty ownership frame.
-       */
-      explicit OwnershipFrame(String::Type encoding = String::Latin1);
-
-      /*!
-       * Construct a ownership based on the data in \a data.
-       */
-      explicit OwnershipFrame(const ByteVector &data);
-
-      /*!
-       * Destroys this OwnershipFrame instance.
-       */
-      virtual ~OwnershipFrame();
-
-      /*!
-       * Returns the text of this popularimeter.
-       *
-       * \see text()
-       */
-      virtual String toString() const;
-
-      /*!
-       * Returns the date purchased.
-       *
-       * \see setDatePurchased()
-       */
-      String datePurchased() const;
-
-      /*!
-       * Set the date purchased.
-       *
-       * \see datePurchased()
-       */
-      void setDatePurchased(const String &datePurchased);
-
-      /*!
-       * Returns the price paid.
-       *
-       * \see setPricePaid()
-       */
-      String pricePaid() const;
-
-      /*!
-       * Set the price paid.
-       *
-       * \see pricePaid()
-       */
-      void setPricePaid(const String &pricePaid);
-
-      /*!
-       * Returns the seller.
-       *
-       * \see setSeller()
-       */
-      String seller() const;
-
-      /*!
-       * Set the seller.
-       *
-       * \see seller()
-       */
-      void setSeller(const String &seller);
-
-      /*!
-       * Returns the text encoding that will be used in rendering this frame.
-       * This defaults to the type that was either specified in the constructor
-       * or read from the frame when parsed.
-       *
-       * \see setTextEncoding()
-       * \see render()
-       */
-      String::Type textEncoding() const;
-
-      /*!
-       * Sets the text encoding to be used when rendering this frame to
-       * \a encoding.
-       *
-       * \see textEncoding()
-       * \see render()
-       */
-      void setTextEncoding(String::Type encoding);
-
-    protected:
-      // Reimplementations.
-
-      virtual void parseFields(const ByteVector &data);
-      virtual ByteVector renderFields() const;
-
-    private:
-      /*!
-       * The constructor used by the FrameFactory.
-       */
-      OwnershipFrame(const ByteVector &data, Header *h);
-      OwnershipFrame(const OwnershipFrame &);
-      OwnershipFrame &operator=(const OwnershipFrame &);
-
-      class OwnershipFramePrivate;
-      OwnershipFramePrivate *d;
-    };
-
-  }
-}
-#endif

taglib/mpeg/id3v2/frames/podcastframe.cpp

@@ -1,79 +0,0 @@
-/***************************************************************************
-    copyright            : (C) 2015 by Urs Fleisch
-    email                : ufleisch@users.sourceforge.net
- ***************************************************************************/
-
-/***************************************************************************
- *   This library is free software; you can redistribute it and/or modify  *
- *   it  under the terms of the GNU Lesser General Public License version  *
- *   2.1 as published by the Free Software Foundation.                     *
- *                                                                         *
- *   This library is distributed in the hope that it will be useful, but   *
- *   WITHOUT ANY WARRANTY; without even the implied warranty of            *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU     *
- *   Lesser General Public License for more details.                       *
- *                                                                         *
- *   You should have received a copy of the GNU Lesser General Public      *
- *   License along with this library; if not, write to the Free Software   *
- *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA         *
- *   02110-1301  USA                                                       *
- *                                                                         *
- *   Alternatively, this file is available under the Mozilla Public        *
- *   License Version 1.1.  You may obtain a copy of the License at         *
- *   http://www.mozilla.org/MPL/                                           *
- ***************************************************************************/
-
-#include "podcastframe.h"
-
-using namespace TagLib;
-using namespace ID3v2;
-
-class PodcastFrame::PodcastFramePrivate
-{
-public:
-  ByteVector fieldData;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-// public members
-////////////////////////////////////////////////////////////////////////////////
-
-PodcastFrame::PodcastFrame() : Frame("PCST")
-{
-  d = new PodcastFramePrivate;
-  d->fieldData = ByteVector(4, '\0');
-}
-
-PodcastFrame::~PodcastFrame()
-{
-  delete d;
-}
-
-String PodcastFrame::toString() const
-{
-  return String();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// protected members
-////////////////////////////////////////////////////////////////////////////////
-
-void PodcastFrame::parseFields(const ByteVector &data)
-{
-  d->fieldData = data;
-}
-
-ByteVector PodcastFrame::renderFields() const
-{
-  return d->fieldData;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// private members
-////////////////////////////////////////////////////////////////////////////////
-
-PodcastFrame::PodcastFrame(const ByteVector &data, Header *h) : Frame(h)
-{
-  d = new PodcastFramePrivate;
-  parseFields(fieldData(data));
-}