Add unit tests

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

.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

CMakeLists.txt

@@ -9,12 +9,6 @@ if(ENABLE_STATIC)
 else()
   set(BUILD_SHARED_LIBS ON)
 endif()
-OPTION(ENABLE_STATIC_RUNTIME "Visual Studio, link with runtime statically"  OFF)
-
-option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden"  OFF)
-if(VISIBILITY_HIDDEN)
-  add_definitions (-fvisibility=hidden)
-endif()
 
 option(BUILD_TESTS "Build the test suite"  OFF)
 option(BUILD_EXAMPLES "Build the examples"  OFF)
@@ -40,14 +34,9 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
 endif()
-if (MSVC AND ENABLE_STATIC_RUNTIME)
-  foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-  endforeach(flag_var)
-endif()
 
 set(TAGLIB_LIB_MAJOR_VERSION "1")
-set(TAGLIB_LIB_MINOR_VERSION "8")
+set(TAGLIB_LIB_MINOR_VERSION "7")
 set(TAGLIB_LIB_PATCH_VERSION "0")
 
 set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
@@ -56,9 +45,9 @@ set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VE
 # 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  13)
+set(TAGLIB_SOVERSION_CURRENT  11)
 set(TAGLIB_SOVERSION_REVISION 0)
-set(TAGLIB_SOVERSION_AGE      12)
+set(TAGLIB_SOVERSION_AGE      10)
 
 math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
 math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
@@ -88,10 +77,7 @@ configure_file(taglib/taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_c
 
 add_subdirectory(taglib) 
 add_subdirectory(bindings)
-if(BUILD_TESTS)
-    enable_testing()
-    add_subdirectory(tests)
-endif(BUILD_TESTS)
+add_subdirectory(tests)
 add_subdirectory(examples)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)

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,41 +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" \
-    -DENABLE_STATIC=ON \
-    -DCMAKE_INSTALL_PREFIX="<folder you want to build to>"
-
-After 'make', and 'make install', add libtag.a to your XCode project, and add
-the include folder to the project's User Header Search Paths.
-
-Windows
--------
-
-For building a static library on Windows with Visual Studio 2010, cd to
-the TagLib folder then:
-
-  cmake -DENABLE_STATIC=ON -DENABLE_STATIC_RUNTIME=ON -G "Visual Studio 10" ...
-  
-Including ENABLE_STATIC_RUNTIME=ON indicates you want TagLib built using the
-static runtime library, rather than the DLL form of the runtime.
-CMake will create a Visual Studio solution, taglib.sln that you can open and
-build as normal.  
+    -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,51 +1,10 @@
-TagLib 1.8 (Sep 6, 2012)
-==============================
+TagLib 1.8 (In Development)
+===========================
 
-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/tag_c.cpp

@@ -58,11 +58,6 @@ void taglib_set_string_management_enabled(BOOL management)
   stringManagementEnabled = bool(management);
 }
 
-void taglib_free(void* pointer)
-{
-  free(pointer);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // TagLib::File wrapper
 ////////////////////////////////////////////////////////////////////////////////
@@ -109,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)

bindings/c/tag_c.h

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

taglib/CMakeLists.txt

@@ -48,7 +48,6 @@ set(tag_HDRS
   toolkit/tfilestream.h
   toolkit/tmap.h
   toolkit/tmap.tcc
-  toolkit/tpropertymap.h
   mpeg/mpegfile.h
   mpeg/mpegproperties.h
   mpeg/mpegheader.h
@@ -65,7 +64,6 @@ set(tag_HDRS
   mpeg/id3v2/frames/attachedpictureframe.h
   mpeg/id3v2/frames/commentsframe.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
@@ -152,7 +150,6 @@ set(frames_SRCS
   mpeg/id3v2/frames/attachedpictureframe.cpp
   mpeg/id3v2/frames/commentsframe.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
@@ -278,7 +275,6 @@ set(toolkit_SRCS
   toolkit/tfile.cpp
   toolkit/tfilestream.cpp
   toolkit/tdebug.cpp
-  toolkit/tpropertymap.cpp
   toolkit/unicode.cpp
 )
 

taglib/ape/apefile.cpp

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

taglib/ape/apefile.h

@@ -95,9 +95,6 @@ namespace TagLib {
        * 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.
-       *
-       * \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,
            Properties::ReadStyle propertiesStyle = Properties::Average);
@@ -113,25 +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.
-       * As for the export, only one tag is taken into account. If the file
-       * has no tag at all, APE will be created.
-       */
-      PropertyMap setProperties(const PropertyMap &);
       /*!
        * Returns the APE::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.

taglib/ape/apefooter.cpp

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

taglib/ape/apeitem.cpp

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

taglib/ape/apeitem.h

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

taglib/ape/apeproperties.cpp

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

taglib/ape/apeproperties.h

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

taglib/ape/apetag.cpp

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

taglib/ape/apetag.h

@@ -103,37 +103,6 @@ namespace TagLib {
       virtual void setYear(uint i);
       virtual void setTrack(uint i);
 
-      /*!
-       * Implements the unified tag dictionary interface -- export function.
-       * APE tags are perfectly compatible with the dictionary interface because they
-       * support both arbitrary tag names and multiple values. Currently only
-       * APE items of type *Text* are handled by the dictionary interface; all *Binary*
-       * and *Locator* items will be put into the unsupportedData list and can be
-       * deleted on request using removeUnsupportedProperties(). The same happens
-       * to Text items if their key is invalid for PropertyMap (which should actually
-       * never happen).
-       *
-       * The only conversion done by this export function is to rename the APE tags
-       * TRACK to TRACKNUMBER, YEAR to DATE, and ALBUM ARTIST to ALBUMARTIST, respectively,
-       * in order to be compliant with the names used in other formats.
-       */
-      PropertyMap properties() const;
-
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified tag dictionary interface -- import function. The same
-       * comments as for the export function apply; 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&);
-
       /*!
        * Returns a pointer to the tag's footer.
        */
@@ -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.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.

taglib/asf/asffile.cpp

@@ -142,19 +142,11 @@ class ASF::File::HeaderExtensionObject : public ASF::File::BaseObject
 {
 public:
   List<ASF::File::BaseObject *> objects;
-  ~HeaderExtensionObject();
   ByteVector guid();
   void parse(ASF::File *file, uint size);
   ByteVector render(ASF::File *file);
 };
 
-ASF::File::HeaderExtensionObject::~HeaderExtensionObject()
-{
-  for(unsigned int i = 0; i < objects.size(); i++) {
-    delete objects[i];
-  }
-}
-
 void ASF::File::BaseObject::parse(ASF::File *file, unsigned int size)
 {
   data.clear();
@@ -348,7 +340,7 @@ void ASF::File::HeaderExtensionObject::parse(ASF::File *file, uint /*size*/)
     else {
       obj = new UnknownObject(guid);
     }
-    obj->parse(file, (unsigned int)size);
+    obj->parse(file, size);
     objects.append(obj);
     dataPos += size;
   }
@@ -368,14 +360,14 @@ ByteVector ASF::File::HeaderExtensionObject::render(ASF::File *file)
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle)
+ASF::File::File(FileName file, bool readProperties, Properties::ReadStyle propertiesStyle) 
   : TagLib::File(file)
 {
   d = new FilePrivate;
   read(readProperties, propertiesStyle);
 }
 
-ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle)
+ASF::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle propertiesStyle) 
   : TagLib::File(stream)
 {
   d = new FilePrivate;
@@ -535,7 +527,7 @@ bool ASF::File::save()
     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, (TagLib::ulong)d->size);
+  insert(data, 0, d->size);
 
   return true;
 }

taglib/asf/asffile.h

@@ -54,9 +54,6 @@ namespace TagLib {
        *
        * \note In the current implementation, both \a readProperties and
        * \a propertiesStyle are ignored.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
        */
       File(FileName file, bool readProperties = true, Properties::ReadStyle propertiesStyle = Properties::Average);
 
@@ -67,9 +64,6 @@ namespace TagLib {
        *
        * \note In the current implementation, both \a readProperties and
        * \a propertiesStyle are ignored.
-       *
-       * \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, Properties::ReadStyle propertiesStyle = Properties::Average);
 

taglib/asf/asfpicture.cpp

@@ -35,7 +35,7 @@
 
 using namespace TagLib;
 
-class ASF::Picture::PicturePrivate : public RefCounter
+class ASF::Picture::PicturePriavte : public RefCounter
 {
 public:
   bool valid;
@@ -51,7 +51,7 @@ public:
 
 ASF::Picture::Picture()
 {
-  d = new PicturePrivate();
+  d = new PicturePriavte();
   d->valid = true;
 }
 

taglib/asf/asfpicture.h

@@ -208,8 +208,8 @@ namespace TagLib
       friend class Attribute;
 #endif
       private:
-        class PicturePrivate;
-        PicturePrivate *d;
+        struct PicturePriavte;
+        PicturePriavte *d;
       };
   }
 }

taglib/asf/asfproperties.cpp

@@ -56,7 +56,7 @@ ASF::Properties::Properties() : AudioProperties(AudioProperties::Average)
 ASF::Properties::~Properties()
 {
   if(d)
-    delete d;
+    delete d;  
 }
 
 int ASF::Properties::length() const
@@ -77,7 +77,7 @@ int ASF::Properties::sampleRate() const
 int ASF::Properties::channels() const
 {
   return d->channels;
-}
+} 
 
 bool ASF::Properties::isEncrypted() const
 {

taglib/asf/asfproperties.h

@@ -73,4 +73,4 @@ namespace TagLib {
 
 }
 
-#endif
+#endif 

taglib/asf/asftag.h

@@ -120,17 +120,17 @@ 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);
 

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)
@@ -152,7 +152,6 @@ StringList FileRef::defaultFileExtensions()
   l.append("spx");
   l.append("tta");
   l.append("m4a");
-  l.append("m4r");
   l.append("m4b");
   l.append("m4p");
   l.append("3g2");
@@ -254,7 +253,7 @@ File *FileRef::create(FileName fileName, bool readAudioProperties,
       return new Ogg::Speex::File(fileName, readAudioProperties, audioPropertiesStyle);
     if(ext == "TTA")
       return new TrueAudio::File(fileName, readAudioProperties, audioPropertiesStyle);
-    if(ext == "M4A" || ext == "M4R" || ext == "M4B" || ext == "M4P" || ext == "MP4" || ext == "3G2")
+    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);

taglib/flac/flacfile.cpp

@@ -28,7 +28,6 @@
 #include <tlist.h>
 #include <tdebug.h>
 #include <tagunion.h>
-#include <tpropertymap.h>
 
 #include <id3v2header.h>
 #include <id3v2tag.h>
@@ -44,7 +43,7 @@ using namespace TagLib;
 
 namespace
 {
-  enum { FlacXiphIndex = 0, FlacID3v2Index = 1, FlacID3v1Index = 2 };
+  enum { XiphIndex = 0, ID3v2Index = 1, ID3v1Index = 2 };
   enum { MinPaddingLength = 4096 };
   enum { LastBlockFlag = 0x80 };
 }
@@ -139,41 +138,6 @@ TagLib::Tag *FLAC::File::tag() const
   return &d->tag;
 }
 
-PropertyMap FLAC::File::properties() const
-{
-  // once Tag::properties() is virtual, this case distinction could actually be done
-  // within TagUnion.
-  if(d->hasXiphComment)
-    return d->tag.access<Ogg::XiphComment>(FlacXiphIndex, false)->properties();
-  if(d->hasID3v2)
-    return d->tag.access<ID3v2::Tag>(FlacID3v2Index, false)->properties();
-  if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(FlacID3v1Index, false)->properties();
-  return PropertyMap();
-}
-
-void FLAC::File::removeUnsupportedProperties(const StringList &unsupported)
-{
-  if(d->hasXiphComment)
-    d->tag.access<Ogg::XiphComment>(FlacXiphIndex, false)->removeUnsupportedProperties(unsupported);
-  if(d->hasID3v2)
-    d->tag.access<ID3v2::Tag>(FlacID3v2Index, false)->removeUnsupportedProperties(unsupported);
-  if(d->hasID3v1)
-    d->tag.access<ID3v1::Tag>(FlacID3v1Index, false)->removeUnsupportedProperties(unsupported);
-}
-
-PropertyMap FLAC::File::setProperties(const PropertyMap &properties)
-{
-  if(d->hasXiphComment)
-    return d->tag.access<Ogg::XiphComment>(FlacXiphIndex, false)->setProperties(properties);
-  else if(d->hasID3v2)
-    return d->tag.access<ID3v2::Tag>(FlacID3v2Index, false)->setProperties(properties);
-  else if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(FlacID3v1Index, false)->setProperties(properties);
-  else
-    return d->tag.access<Ogg::XiphComment>(FlacXiphIndex, true)->setProperties(properties);
-}
-
 FLAC::Properties *FLAC::File::audioProperties() const
 {
   return d->properties;
@@ -243,7 +207,7 @@ bool FLAC::File::save()
   }
   ByteVector padding = ByteVector::fromUInt(paddingLength);
   padding.resize(paddingLength + 4);
-  padding[0] = (char)(FLAC::MetadataBlock::Padding | LastBlockFlag);
+  padding[0] = FLAC::MetadataBlock::Padding | LastBlockFlag;
   data.append(padding);
 
   // Write the data to the file
@@ -275,21 +239,21 @@ bool FLAC::File::save()
 
 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)
@@ -310,12 +274,12 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle
 
   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(FlacID3v2Index, 0);
+      d->tag.set(ID3v2Index, 0);
     else
       d->hasID3v2 = true;
   }
@@ -325,7 +289,7 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle
   d->ID3v1Location = findID3v1();
 
   if(d->ID3v1Location >= 0) {
-    d->tag.set(FlacID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+    d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
     d->hasID3v1 = true;
   }
 
@@ -337,9 +301,9 @@ void FLAC::File::read(bool readProperties, Properties::ReadStyle propertiesStyle
     return;
 
   if(d->hasXiphComment)
-    d->tag.set(FlacXiphIndex, new Ogg::XiphComment(xiphCommentData()));
+    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)
     d->properties = new Properties(streamInfoData(), streamLength(), propertiesStyle);
@@ -529,17 +493,6 @@ void FLAC::File::addPicture(Picture *picture)
   d->blocks.append(picture);
 }
 
-void FLAC::File::removePicture(Picture *picture, bool del)
-{
-  MetadataBlock *block = picture;
-  List<MetadataBlock *>::Iterator it = d->blocks.find(block);
-  if(it != d->blocks.end())
-    d->blocks.erase(it);
-
-  if(del)
-    delete picture;
-}
-
 void FLAC::File::removePictures()
 {
   List<MetadataBlock *> 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; }
@@ -97,9 +97,6 @@ namespace TagLib {
        *
        * If this file contains and ID3v2 tag the frames will be created using
        * \a frameFactory.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
        */
       // BIC: merge with the above constructor
       File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
@@ -121,23 +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.
-       * As with the export, only one tag is taken into account. If the file
-       * has no tag at all, a XiphComment will be created.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the FLAC::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.
@@ -222,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.
        */

taglib/flac/flacmetadatablock.cpp

@@ -33,7 +33,7 @@
 
 using namespace TagLib;
 
-class FLAC::MetadataBlock::MetadataBlockPrivate
+class FLAC::MetadataBlock::MetadataBlockPrivate 
 {
 public:
   MetadataBlockPrivate() {}

taglib/flac/flacpicture.cpp

@@ -33,7 +33,7 @@
 
 using namespace TagLib;
 
-class FLAC::Picture::PicturePrivate
+class FLAC::Picture::PicturePrivate 
 {
 public:
   PicturePrivate() :
@@ -117,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

@@ -42,8 +42,7 @@ public:
     bitrate(0),
     sampleRate(0),
     sampleWidth(0),
-    channels(0),
-    sampleFrames(0) {}
+    channels(0) {}
 
   ByteVector data;
   long streamLength;
@@ -53,7 +52,6 @@ public:
   int sampleRate;
   int sampleWidth;
   int channels;
-  unsigned long long sampleFrames;
   ByteVector signature;
 };
 
@@ -103,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;
@@ -139,8 +132,6 @@ void FLAC::Properties::read()
   pos += 3;
 
   uint flags = d->data.mid(pos, 4).toUInt(true);
-  pos += 4;
-
   d->sampleRate = flags >> 12;
   d->channels = ((flags >> 9) & 7) + 1;
   d->sampleWidth = ((flags >> 4) & 31) + 1;
@@ -148,14 +139,12 @@ void FLAC::Properties::read()
   // The last 4 bits are the most significant 4 bits for the 36 bit
   // stream length in samples. (Audio files measured in days)
 
-  unsigned long long hi = flags & 0xf;
-  unsigned long long lo = d->data.mid(pos, 4).toUInt(true);
+  uint highLength =d->sampleRate > 0 ? (((flags & 0xf) << 28) / d->sampleRate) << 4 : 0;
   pos += 4;
 
-  d->sampleFrames = (hi << 32) | lo;
-
-  if(d->sampleRate > 0)
-    d->length = int(d->sampleFrames / d->sampleRate);
+  d->length = d->sampleRate > 0 ?
+      (d->data.mid(pos, 4).toUInt(true)) / d->sampleRate + highLength : 0;
+  pos += 4;
 
   // Uncompressed bitrate:
 

taglib/flac/flacproperties.h

@@ -77,11 +77,6 @@ namespace TagLib {
        */
       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 header.

taglib/flac/flacunknownmetadatablock.cpp

@@ -34,7 +34,7 @@
 
 using namespace TagLib;
 
-class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
+class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate 
 {
 public:
   UnknownMetadataBlockPrivate() : code(0) {}

taglib/it/itfile.cpp

@@ -23,7 +23,6 @@
 #include "itfile.h"
 #include "tdebug.h"
 #include "modfileprivate.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace IT;
@@ -66,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;
@@ -125,10 +114,10 @@ bool IT::File::save()
     ulong sampleOffset = 0;
     if(!readU32L(sampleOffset))
       return false;
-
+    
     seek(sampleOffset + 20);
 
-    if((TagLib::uint)(i + instrumentCount) < lines.size())
+    if((i + instrumentCount) < lines.size())
       writeString(lines[i + instrumentCount], 25);
     else
       writeString(String::null, 25);
@@ -155,7 +144,7 @@ bool IT::File::save()
   if(!readU16L(special))
     return false;
 
-  ulong fileSize = File::length();
+  long fileSize = this->length();
   if(special & Properties::MessageAttached) {
     seek(54);
     if(!readU16L(messageLength) || !readU32L(messageOffset))
@@ -171,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());
@@ -206,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);
@@ -251,11 +240,10 @@ 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
   ushort realLength = 0;
   for(ushort i = 0; i < length; ++ i) {
@@ -287,11 +275,11 @@ void IT::File::read(bool)
     READ_STRING_AS(instrumentName, 26);
     comment.append(instrumentName);
   }
-
+  
   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);
@@ -317,7 +305,7 @@ void IT::File::read(bool)
     READ_BYTE_AS(vibratoRate);
     READ_BYTE_AS(vibratoType);
     */
-
+    
     comment.append(sampleName);
   }
 

taglib/it/itfile.h

@@ -48,9 +48,6 @@ namespace TagLib {
          * 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.
-         *
-         * \note TagLib will *not* take ownership of the stream, the caller is
-         * responsible for deleting it after the File object.
          */
         File(IOStream *stram, bool readProperties = true,
              AudioProperties::ReadStyle propertiesStyle =
@@ -63,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.
@@ -89,7 +74,6 @@ namespace TagLib {
          */
         bool save();
 
-
       private:
         File(const File &);
         File &operator=(const File &);

taglib/it/itproperties.cpp

@@ -94,7 +94,7 @@ int IT::Properties::channels() const
   return d->channels;
 }
 
-TagLib::ushort IT::Properties::lengthInPatterns() const
+ushort IT::Properties::lengthInPatterns() const
 {
   return d->lengthInPatterns;
 }
@@ -104,37 +104,37 @@ bool IT::Properties::stereo() const
   return d->flags & Stereo;
 }
 
-TagLib::ushort IT::Properties::instrumentCount() const
+ushort IT::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }
 
-TagLib::ushort IT::Properties::sampleCount() const
+ushort IT::Properties::sampleCount() const
 {
   return d->sampleCount;
 }
 
-TagLib::ushort IT::Properties::patternCount() const
+ushort IT::Properties::patternCount() const
 {
   return d->patternCount;
 }
 
-TagLib::ushort IT::Properties::version() const
+ushort IT::Properties::version() const
 {
   return d->version;
 }
 
-TagLib::ushort IT::Properties::compatibleVersion() const
+ushort IT::Properties::compatibleVersion() const
 {
   return d->compatibleVersion;
 }
 
-TagLib::ushort IT::Properties::flags() const
+ushort IT::Properties::flags() const
 {
   return d->flags;
 }
 
-TagLib::ushort IT::Properties::special() const
+ushort IT::Properties::special() const
 {
   return d->special;
 }

taglib/it/itproperties.h

@@ -50,7 +50,7 @@ namespace TagLib {
 
       Properties(AudioProperties::ReadStyle propertiesStyle);
       virtual ~Properties();
-
+      
       int length()     const;
       int bitrate()    const;
       int sampleRate() const;
@@ -72,7 +72,9 @@ namespace TagLib {
       uchar  panningSeparation() const;
       uchar  pitchWheelDepth()   const;
 
+    protected:
       void setChannels(int channels);
+
       void setLengthInPatterns(ushort lengthInPatterns);
       void setInstrumentCount(ushort instrumentCount);
       void setSampleCount (ushort sampleCount);

taglib/mod/modfile.cpp

@@ -23,7 +23,6 @@
 #include "tstringlist.h"
 #include "tdebug.h"
 #include "modfileprivate.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace Mod;
@@ -71,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()) {

taglib/mod/modfile.h

@@ -33,74 +33,57 @@ namespace TagLib {
 
   namespace Mod {
 
-    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);
+    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);
 
-      /*!
-       * 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.
-       *
-       * \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.h

@@ -31,9 +31,7 @@
 #include <algorithm>
 
 namespace TagLib {
-
   namespace Mod {
-
     class TAGLIB_EXPORT FileBase : public TagLib::File
     {
     protected:
@@ -54,9 +52,7 @@ namespace TagLib {
       bool readU16B(ushort &number);
       bool readU32B(ulong &number);
     };
-
   }
-
 }
 
 #endif

taglib/mod/modproperties.cpp

@@ -33,7 +33,7 @@ public:
     lengthInPatterns(0)
   {
   }
-
+  
   int   channels;
   uint  instrumentCount;
   uchar lengthInPatterns;
@@ -70,7 +70,7 @@ int Mod::Properties::channels() const
   return d->channels;
 }
 
-TagLib::uint Mod::Properties::instrumentCount() const
+uint Mod::Properties::instrumentCount() const
 {
   return d->instrumentCount;
 }

taglib/mod/modproperties.h

@@ -26,40 +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 length()     const;
+      int bitrate()    const;
       int sampleRate() const;
-      int channels() const;
+      int channels()   const;
 
-      uint instrumentCount() const;
+      uint  instrumentCount()  const;
       uchar lengthInPatterns() const;
 
+    protected:
       void setChannels(int channels);
 
       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

@@ -20,8 +20,6 @@
  ***************************************************************************/
 
 #include "modtag.h"
-#include "tstringlist.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace Mod;
@@ -73,12 +71,12 @@ String Mod::Tag::genre() const
   return String::null;
 }
 
-TagLib::uint Mod::Tag::year() const
+uint Mod::Tag::year() const
 {
   return 0;
 }
 
-TagLib::uint Mod::Tag::track() const
+uint Mod::Tag::track() const
 {
   return 0;
 }
@@ -122,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.isNull()))
-    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 = String::null;
-
-  if(properties.contains("COMMENT")) {
-    d->comment = properties["COMMENT"].front();
-    oneValueSet.append("COMMENT");
-  } else
-    d->comment = String::null;
-
-  if(properties.contains("TRACKERNAME")) {
-    d->trackerName = properties["TRACKERNAME"].front();
-    oneValueSet.append("TRACKERNAME");
-  } else
-    d->trackerName = String::null;
-
-  // 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::Iterator 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

@@ -25,9 +25,7 @@
 #include "tag.h"
 
 namespace TagLib {
-
   namespace Mod {
-
     /*!
      * Tags for module files (Mod, S3M, IT, XM).
      *
@@ -150,31 +148,15 @@ namespace TagLib {
       /*!
        * 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
-       * returened. 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 &);
@@ -182,9 +164,7 @@ namespace TagLib {
       class TagPrivate;
       TagPrivate *d;
     };
-
   }
-
 }
 
 #endif

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,40 +40,6 @@ 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 ingteger
-      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:

taglib/mp4/mp4coverart.h

@@ -29,7 +29,6 @@
 #include "tlist.h"
 #include "tbytevector.h"
 #include "taglib_export.h"
-#include "mp4atom.h"
 
 namespace TagLib {
 
@@ -42,10 +41,8 @@ namespace TagLib {
        * This describes the image type.
        */
       enum Format {
-        JPEG = TypeJPEG,
-        PNG  = TypePNG,
-        BMP  = TypeBMP,
-        GIF  = TypeGIF
+        JPEG = 0x0D,
+        PNG  = 0x0E
       };
 
       CoverArt(Format format, const ByteVector &data);

taglib/mp4/mp4file.h

@@ -65,9 +65,6 @@ namespace TagLib {
        *
        * \note In the current implementation, both \a readProperties and
        * \a propertiesStyle are ignored.
-       *
-       * \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, Properties::ReadStyle audioPropertiesStyle = Properties::Average);
 

taglib/mp4/mp4item.cpp

@@ -36,20 +36,15 @@ 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;
-    uchar m_byte;
-    uint m_uint;
-    long long m_longlong;
   };
   StringList m_stringList;
-  ByteVectorList m_byteVectorList;
   MP4::CoverArtList m_coverArtList;
 };
 
@@ -94,24 +89,6 @@ MP4::Item::Item(int value)
   d->m_int = value;
 }
 
-MP4::Item::Item(uchar value)
-{
-  d = new ItemPrivate;
-  d->m_byte = value;
-}
-
-MP4::Item::Item(uint 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;
@@ -119,12 +96,6 @@ MP4::Item::Item(int value1, int value2)
   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;
@@ -137,16 +108,6 @@ MP4::Item::Item(const MP4::CoverArtList &value)
   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
 {
@@ -159,24 +120,6 @@ MP4::Item::toInt() const
   return d->m_int;
 }
 
-uchar
-MP4::Item::toByte() const
-{
-  return d->m_byte;
-}
-
-TagLib::uint
-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
 {
@@ -189,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
 {

taglib/mp4/mp4item.h

@@ -47,26 +47,15 @@ namespace TagLib {
       ~Item();
 
       Item(int value);
-      Item(uchar value);
-      Item(uint 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;
-      uchar toByte() const;
-      uint 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

@@ -90,24 +90,15 @@ MP4::Properties::Properties(File *file, MP4::Atoms *atoms, ReadStyle style)
 
   file->seek(mdhd->offset);
   data = file->readBlock(mdhd->length);
-  uint version = data[8];
-  if(version == 1) {
-    if (data.size() < 36 + 8) {
-      debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
-      return;
-    }
-    long long unit = data.mid(28, 8).toLongLong();
-    long long length = data.mid(36, 8).toLongLong();
-    d->length = unit ? int(length / unit) : 0;
-  }
-  else {
-    if (data.size() < 24 + 4) {
-      debug("MP4: Atom 'trak.mdia.mdhd' is smaller than expected");
-      return;
-    }
+  if(data[8] == 0) {
     unsigned int unit = data.mid(20, 4).toUInt();
     unsigned int length = data.mid(24, 4).toUInt();
-    d->length = unit ? length / unit : 0;
+    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");

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
  **************************************************************************/
 
@@ -71,23 +71,12 @@ MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms)
     else if(atom->name == "trkn" || atom->name == "disk") {
       parseIntPair(atom, file);
     }
-    else if(atom->name == "cpil" || atom->name == "pgap" || atom->name == "pcst" ||
-            atom->name == "hdvd") {
+    else if(atom->name == "cpil" || atom->name == "pgap" || atom->name == "pcst") {
       parseBool(atom, file);
     }
     else if(atom->name == "tmpo") {
       parseInt(atom, file);
     }
-    else if(atom->name == "tvsn" || atom->name == "tves" || atom->name == "cnID" ||
-            atom->name == "sfID" || atom->name == "atID" || atom->name == "geID") {
-      parseUInt(atom, file);
-    }
-    else if(atom->name == "plID") {
-      parseLongLong(atom, file);
-    }
-    else if(atom->name == "stik" || atom->name == "rtng" || atom->name == "akID") {
-      parseByte(atom, file);
-    }
     else if(atom->name == "gnre") {
       parseGnre(atom, file);
     }
@@ -105,10 +94,10 @@ MP4::Tag::~Tag()
   delete d;
 }
 
-MP4::AtomDataList
-MP4::Tag::parseData2(MP4::Atom *atom, TagLib::File *file, int expectedFlags, bool freeForm)
+ByteVectorList
+MP4::Tag::parseData(MP4::Atom *atom, TagLib::File *file, int expectedFlags, bool freeForm)
 {
-  AtomDataList result;
+  ByteVectorList result;
   ByteVector data = file->readBlock(atom->length - 8);
   int i = 0;
   unsigned int pos = 0;
@@ -125,7 +114,7 @@ MP4::Tag::parseData2(MP4::Atom *atom, TagLib::File *file, int expectedFlags, boo
         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") {
@@ -133,7 +122,7 @@ MP4::Tag::parseData2(MP4::Atom *atom, TagLib::File *file, int expectedFlags, boo
         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;
@@ -142,17 +131,6 @@ MP4::Tag::parseData2(MP4::Atom *atom, TagLib::File *file, int expectedFlags, boo
   return result;
 }
 
-ByteVectorList
-MP4::Tag::parseData(MP4::Atom *atom, TagLib::File *file, int expectedFlags, bool freeForm)
-{
-  AtomDataList data = parseData2(atom, file, expectedFlags, freeForm);
-  ByteVectorList result;
-  for(uint i = 0; i < data.size(); i++) {
-    result.append(data[i].data);
-  }
-  return result;
-}
-
 void
 MP4::Tag::parseInt(MP4::Atom *atom, TagLib::File *file)
 {
@@ -162,33 +140,6 @@ MP4::Tag::parseInt(MP4::Atom *atom, TagLib::File *file)
   }
 }
 
-void
-MP4::Tag::parseUInt(MP4::Atom *atom, TagLib::File *file)
-{
-  ByteVectorList data = parseData(atom, file);
-  if(data.size()) {
-    d->items.insert(atom->name, data[0].toUInt());
-  }
-}
-
-void
-MP4::Tag::parseLongLong(MP4::Atom *atom, TagLib::File *file)
-{
-  ByteVectorList data = parseData(atom, file);
-  if(data.size()) {
-    d->items.insert(atom->name, data[0].toLongLong());
-  }
-}
-
-void
-MP4::Tag::parseByte(MP4::Atom *atom, TagLib::File *file)
-{
-  ByteVectorList data = parseData(atom, file);
-  if(data.size()) {
-    d->items.insert(atom->name, (uchar)data[0].at(0));
-  }
-}
-
 void
 MP4::Tag::parseGnre(MP4::Atom *atom, TagLib::File *file)
 {
@@ -238,34 +189,14 @@ MP4::Tag::parseText(MP4::Atom *atom, TagLib::File *file, int expectedFlags)
 void
 MP4::Tag::parseFreeForm(MP4::Atom *atom, TagLib::File *file)
 {
-  AtomDataList data = parseData2(atom, file, -1, true);
+  ByteVectorList data = parseData(atom, file, 1, true);
   if(data.size() > 2) {
-    String name = "----:" + String(data[0].data, String::UTF8) + ':' + String(data[1].data, String::UTF8);
-    AtomDataType type = data[2].type;
-    for(uint i = 2; i < data.size(); i++) {
-      if(data[i].type != type) {
-        debug("MP4: We currently don't support values with multiple types");
-        break;
-      }
-    }
-    if(type == TypeUTF8) {
-      StringList value;
-      for(uint i = 2; i < data.size(); i++) {
-        value.append(String(data[i].data, String::UTF8));
-      }
-      Item item(value);
-      item.setAtomDataType(type);
-      d->items.insert(name, item);
-    }
-    else {
-      ByteVectorList value;
-      for(uint i = 2; i < data.size(); i++) {
-        value.append(data[i].data);
-      }
-      Item item(value);
-      item.setAtomDataType(type);
-      d->items.insert(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);
   }
 }
 
@@ -283,7 +214,7 @@ MP4::Tag::parseCovr(MP4::Atom *atom, TagLib::File *file)
       debug("MP4: Unexpected atom \"" + name + "\", expecting \"data\"");
       break;
     }
-    if(flags == TypeJPEG || flags == TypePNG || flags == TypeBMP || flags == TypeGIF) {
+    if(flags == MP4::CoverArt::PNG || flags == MP4::CoverArt::JPEG) {
       value.append(MP4::CoverArt(MP4::CoverArt::Format(flags),
                                  data.mid(pos + 16, length - 16)));
     }
@@ -323,7 +254,7 @@ 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
@@ -331,31 +262,7 @@ MP4::Tag::renderInt(const ByteVector &name, MP4::Item &item)
 {
   ByteVectorList data;
   data.append(ByteVector::fromShort(item.toInt()));
-  return renderData(name, TypeInteger, data);
-}
-
-ByteVector
-MP4::Tag::renderUInt(const ByteVector &name, MP4::Item &item)
-{
-  ByteVectorList data;
-  data.append(ByteVector::fromUInt(item.toUInt()));
-  return renderData(name, TypeInteger, data);
-}
-
-ByteVector
-MP4::Tag::renderLongLong(const ByteVector &name, MP4::Item &item)
-{
-  ByteVectorList data;
-  data.append(ByteVector::fromLongLong(item.toLongLong()));
-  return renderData(name, TypeInteger, data);
-}
-
-ByteVector
-MP4::Tag::renderByte(const ByteVector &name, MP4::Item &item)
-{
-  ByteVectorList data;
-  data.append(ByteVector(1, item.toByte()));
-  return renderData(name, TypeInteger, data);
+  return renderData(name, 0x15, data);
 }
 
 ByteVector
@@ -366,7 +273,7 @@ MP4::Tag::renderIntPair(const ByteVector &name, MP4::Item &item)
               ByteVector::fromShort(item.toIntPair().first) +
               ByteVector::fromShort(item.toIntPair().second) +
               ByteVector(2, '\0'));
-  return renderData(name, TypeImplicit, data);
+  return renderData(name, 0x00, data);
 }
 
 ByteVector
@@ -376,7 +283,7 @@ MP4::Tag::renderIntPairNoTrailing(const ByteVector &name, MP4::Item &item)
   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
@@ -413,26 +320,9 @@ MP4::Tag::renderFreeForm(const String &name, MP4::Item &item)
   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(unsigned int i = 0; i < value.size(); i++) {
-      data.append(renderAtom("data", ByteVector::fromUInt(type) + ByteVector(4, '\0') + value[i].data(String::UTF8)));
-    }
-  }
-  else {
-    ByteVectorList value = item.toByteVectorList();
-    for(unsigned int i = 0; i < value.size(); i++) {
-      data.append(renderAtom("data", ByteVector::fromUInt(type) + ByteVector(4, '\0') + value[i]));
-    }
+  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);
 }
@@ -452,22 +342,12 @@ MP4::Tag::save()
     else if(name == "disk") {
       data.append(renderIntPairNoTrailing(name.data(String::Latin1), i->second));
     }
-    else if(name == "cpil" || name == "pgap" || name == "pcst" || name == "hdvd") {
+    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), i->second));
     }
-    else if(name == "tvsn" || name == "tves" || name == "cnID" ||
-            name == "sfID" || name == "atID" || name == "geID") {
-      data.append(renderUInt(name.data(String::Latin1), i->second));
-    }
-    else if(name == "plID") {
-      data.append(renderLongLong(name.data(String::Latin1), i->second));
-    }
-    else if(name == "stik" || name == "rtng" || name == "akID") {
-      data.append(renderByte(name.data(String::Latin1), i->second));
-    }
     else if(name == "covr") {
       data.append(renderCovr(name.data(String::Latin1), i->second));
     }

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
  **************************************************************************/
 
@@ -68,14 +68,10 @@ namespace TagLib {
         ItemListMap &itemListMap();
 
     private:
-        AtomDataList parseData2(Atom *atom, TagLib::File *file, int expectedFlags = -1, bool freeForm = false);
         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 parseByte(Atom *atom, TagLib::File *file);
-        void parseUInt(Atom *atom, TagLib::File *file);
-        void parseLongLong(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);
@@ -84,13 +80,10 @@ namespace TagLib {
         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 = TypeUTF8);
+        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 renderByte(const ByteVector &name, Item &item);
-        TagLib::ByteVector renderUInt(const ByteVector &name, Item &item);
-        TagLib::ByteVector renderLongLong(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);

taglib/mpc/mpcfile.cpp

@@ -27,7 +27,6 @@
 #include <tstring.h>
 #include <tagunion.h>
 #include <tdebug.h>
-#include <tpropertymap.h>
 
 #include "mpcfile.h"
 #include "id3v1tag.h"
@@ -39,7 +38,7 @@ using namespace TagLib;
 
 namespace
 {
-  enum { MPCAPEIndex, MPCID3v1Index };
+  enum { APEIndex, ID3v1Index };
 }
 
 class MPC::File::FilePrivate
@@ -114,34 +113,6 @@ TagLib::Tag *MPC::File::tag() const
   return &d->tag;
 }
 
-PropertyMap MPC::File::properties() const
-{
-  if(d->hasAPE)
-    return d->tag.access<APE::Tag>(MPCAPEIndex, false)->properties();
-  if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(MPCID3v1Index, false)->properties();
-  return PropertyMap();
-}
-
-void MPC::File::removeUnsupportedProperties(const StringList &properties)
-{
-  if(d->hasAPE)
-    d->tag.access<APE::Tag>(MPCAPEIndex, false)->removeUnsupportedProperties(properties);
-  if(d->hasID3v1)
-    d->tag.access<ID3v1::Tag>(MPCID3v1Index, false)->removeUnsupportedProperties(properties);
-}
-
-PropertyMap MPC::File::setProperties(const PropertyMap &properties)
-{
-  if(d->hasAPE)
-    return d->tag.access<APE::Tag>(MPCAPEIndex, false)->setProperties(properties);
-  else if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(MPCID3v1Index, false)->setProperties(properties);
-  else
-    return d->tag.access<APE::Tag>(APE, true)->setProperties(properties);
-}
-
-
 MPC::Properties *MPC::File::audioProperties() const
 {
   return d->properties;
@@ -225,18 +196,18 @@ bool MPC::File::save()
 
 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);
+    d->tag.set(ID3v1Index, 0);
     APETag(true);
   }
 
@@ -246,7 +217,7 @@ void MPC::File::strip(int tags)
   }
 
   if(tags & APE) {
-    d->tag.set(MPCAPEIndex, 0);
+    d->tag.set(APEIndex, 0);
 
     if(!ID3v1Tag())
       APETag(true);
@@ -270,7 +241,7 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
   d->ID3v1Location = findID3v1();
 
   if(d->ID3v1Location >= 0) {
-    d->tag.set(MPCID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
+    d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
     d->hasID3v1 = true;
   }
 
@@ -281,7 +252,7 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
   d->APELocation = findAPE();
 
   if(d->APELocation >= 0) {
-    d->tag.set(MPCAPEIndex, new APE::Tag(this, d->APELocation));
+    d->tag.set(APEIndex, new APE::Tag(this, d->APELocation));
 
     d->APESize = APETag()->footer()->completeTagSize();
     d->APELocation = d->APELocation + APETag()->footer()->size() - d->APESize;
@@ -310,7 +281,8 @@ void MPC::File::read(bool readProperties, Properties::ReadStyle /* propertiesSty
   // Look for MPC metadata
 
   if(readProperties) {
-    d->properties = new Properties(this, length() - d->ID3v2Size - d->APESize);
+    d->properties = new Properties(readBlock(MPC::HeaderSize),
+                                   length() - d->ID3v2Size - d->APESize);
   }
 }
 

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;
@@ -95,9 +92,6 @@ namespace TagLib {
        * 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.
-       *
-       * \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,
            Properties::ReadStyle propertiesStyle = Properties::Average);
@@ -113,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.
-       * As with the export, only one tag is taken into account. If the file
-       * has no tag at all, an APE tag will be created.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the MPC::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.
@@ -185,6 +163,7 @@ namespace TagLib {
        */
       void remove(int tags = AllTags);
 
+
     private:
       File(const File &);
       File &operator=(const File &);

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,21 +35,17 @@ using namespace TagLib;
 class MPC::Properties::PropertiesPrivate
 {
 public:
-  PropertiesPrivate(long length, ReadStyle s) :
+  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) {}
 
+  ByteVector data;
   long streamLength;
   ReadStyle style;
   int version;
@@ -58,13 +53,6 @@ public:
   int bitrate;
   int sampleRate;
   int channels;
-  uint totalFrames;
-  uint sampleFrames;
-  uint trackGain;
-  uint trackPeak;
-  uint albumGain;
-  uint albumPeak;
-  String flags;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -73,22 +61,8 @@ public:
 
 MPC::Properties::Properties(const ByteVector &data, long streamLength, ReadStyle style) : AudioProperties(style)
 {
-  d = new PropertiesPrivate(streamLength, style);
-  readSV7(data);
-}
-
-MPC::Properties::Properties(File *file, long streamLength, ReadStyle style) : AudioProperties(style)
-{
-  d = new PropertiesPrivate(streamLength, style);
-  ByteVector magic = file->readBlock(4);
-  if(magic == "MPCK") {
-    // Musepack version 8
-    readSV8(file);
-  }
-  else {
-    // Musepack version 7 or older, fixed size header
-    readSV7(magic + file->readBlock(MPC::HeaderSize - 4));
-  }
+  d = new PropertiesPrivate(data, streamLength, style);
+  read();
 }
 
 MPC::Properties::~Properties()
@@ -121,179 +95,30 @@ int MPC::Properties::mpcVersion() const
   return d->version;
 }
 
-TagLib::uint MPC::Properties::totalFrames() const
-{
-  return d->totalFrames;
-}
-
-TagLib::uint 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
 ////////////////////////////////////////////////////////////////////////////////
 
-unsigned long readSize(File *file, TagLib::uint &sizelength)
-{
-  unsigned char tmp;
-  unsigned long size = 0;
-
-  do {
-    ByteVector b = file->readBlock(1);
-    tmp = b[0];
-    size = (size << 7) | (tmp & 0x7F);
-    sizelength++;
-  } while((tmp & 0x80));
-  return size;
-}
-
-unsigned long readSize(const ByteVector &data, TagLib::uint &sizelength)
-{
-  unsigned char tmp;
-  unsigned long size = 0;
-  unsigned long pos = 0;
-
-  do {
-    tmp = data[pos++];
-    size = (size << 7) | (tmp & 0x7F);
-    sizelength++;
-  } while((tmp & 0x80) && (pos < data.size()));
-  return size;
-}
-
 static const unsigned short sftable [4] = { 44100, 48000, 37800, 32000 };
 
-void MPC::Properties::readSV8(File *file)
+void MPC::Properties::read()
 {
-  bool readSH = false, readRG = false;
+  if(!d->data.startsWith("MP+"))
+    return;
 
-  while(!readSH && !readRG) {
-    ByteVector packetType = file->readBlock(2);
-    uint packetSizeLength = 0;
-    unsigned long packetSize = readSize(file, packetSizeLength);
-    unsigned long dataSize = packetSize - 2 - packetSizeLength;
+  d->version = d->data[3] & 15;
 
-    if(packetType == "SH") {
-      // Stream Header
-      // http://trac.musepack.net/wiki/SV8Specification#StreamHeaderPacket
-      ByteVector data = file->readBlock(dataSize);
-      readSH = true;
+  unsigned int frames;
 
-      TagLib::uint pos = 4;
-      d->version = data[pos];
-      pos += 1;
-      d->sampleFrames = readSize(data.mid(pos), pos);
-      ulong begSilence = readSize(data.mid(pos), pos);
+  if(d->version >= 7) {
+    frames = d->data.mid(4, 4).toUInt(false);
 
-      std::bitset<16> flags(TAGLIB_CONSTRUCT_BITSET(data.mid(pos, 2).toUShort(true)));
-      pos += 2;
-
-      d->sampleRate = sftable[flags[15] * 4 + flags[14] * 2 + flags[13]];
-      d->channels = flags[7] * 8 + flags[6] * 4 + flags[5] * 2 + flags[4] + 1;
-
-      if((d->sampleFrames - begSilence) != 0)
-        d->bitrate = (int)(d->streamLength * 8.0 * d->sampleRate / (d->sampleFrames - begSilence));
-      d->bitrate = d->bitrate / 1000;
-
-      d->length = (d->sampleFrames - begSilence) / d->sampleRate;
-    }
-
-    else if (packetType == "RG") {
-      // Replay Gain
-      // http://trac.musepack.net/wiki/SV8Specification#ReplaygainPacket
-      ByteVector data = file->readBlock(dataSize);
-      readRG = true;
-
-      int replayGainVersion = data[0];
-      if(replayGainVersion == 1) {
-        d->trackGain = data.mid(1, 2).toUInt(true);
-        d->trackPeak = data.mid(3, 2).toUInt(true);
-        d->albumGain = data.mid(5, 2).toUInt(true);
-        d->albumPeak = data.mid(7, 2).toUInt(true);
-      }
-    }
-
-    else if(packetType == "SE") {
-      break;
-    }
-
-    else {
-      file->seek(dataSize, File::Current);
-    }
-  }
-}
-
-void MPC::Properties::readSV7(const ByteVector &data)
-{
-  if(data.startsWith("MP+")) {
-    d->version = data[3] & 15;
-    if(d->version < 7)
-      return;
-
-    d->totalFrames = data.mid(4, 4).toUInt(false);
-
-    std::bitset<32> flags(TAGLIB_CONSTRUCT_BITSET(data.mid(8, 4).toUInt(false)));
+    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;
-
-    uint gapless = data.mid(5, 4).toUInt(false);
-
-    d->trackGain = data.mid(14,2).toShort(false);
-    d->trackPeak = data.mid(12,2).toUInt(false);
-    d->albumGain = data.mid(18,2).toShort(false);
-    d->albumPeak = data.mid(16,2).toUInt(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) {
-      uint lastFrameSamples = (gapless >> 20) & 0x07FF;
-      d->sampleFrames = d->totalFrames * 1152 - lastFrameSamples;
-    }
-    else
-      d->sampleFrames = d->totalFrames * 1152 - 576;
   }
   else {
-    uint headerData = data.mid(0, 4).toUInt(false);
+    uint headerData = d->data.mid(0, 4).toUInt(false);
 
     d->bitrate = (headerData >> 23) & 0x01ff;
     d->version = (headerData >> 11) & 0x03ff;
@@ -301,16 +126,15 @@ void MPC::Properties::readSV7(const ByteVector &data)
     d->channels = 2;
 
     if(d->version >= 5)
-      d->totalFrames = data.mid(4, 4).toUInt(false);
+      frames = d->data.mid(4, 4).toUInt(false);
     else
-      d->totalFrames = data.mid(6, 2).toUInt(false);
-
-    d->sampleFrames = d->totalFrames * 1152 - 576;
+      frames = d->data.mid(6, 2).toUInt(false);
   }
 
-  d->length = d->sampleRate > 0 ? (d->sampleFrames + (d->sampleRate / 2)) / d->sampleRate : 0;
+  uint samples = frames * 1152 - 576;
+
+  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

@@ -50,17 +50,9 @@ 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.
        */
@@ -74,44 +66,15 @@ namespace TagLib {
       virtual int channels() const;
 
       /*!
-       * Returns the version of the bitstream (SV4-SV8)
+       * Returns the version of the bitstream (SV4-SV7)
        */
       int mpcVersion() const;
-      uint totalFrames() const;
-      uint 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);
-      void readSV8(File *file);
+      void read();
 
       class PropertiesPrivate;
       PropertiesPrivate *d;

taglib/mpeg/id3v1/id3v1tag.cpp

@@ -51,17 +51,12 @@ public:
   static const StringHandler *stringHandler;
 };
 
-static const StringHandler defaultStringHandler;
-const ID3v1::StringHandler *ID3v1::Tag::TagPrivate::stringHandler = &defaultStringHandler;
+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();
@@ -194,10 +189,8 @@ void ID3v1::Tag::setTrack(uint i)
 
 void ID3v1::Tag::setStringHandler(const StringHandler *handler)
 {
-  if (handler)
-    TagPrivate::stringHandler = handler;
-  else
-    TagPrivate::stringHandler = &defaultStringHandler;
+  delete TagPrivate::stringHandler;
+  TagPrivate::stringHandler = handler;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

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
@@ -154,11 +153,6 @@ namespace TagLib {
       /*!
        * 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/commentsframe.cpp

@@ -29,7 +29,6 @@
 #include <tstringlist.h>
 
 #include "commentsframe.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -110,19 +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 if(key.isNull())
-    map.unsupportedData().append(L"COMM/" + description());
-  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");
@@ -158,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

@@ -136,17 +136,6 @@ 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 decription \a d and returns a pointer to it.  If no

taglib/mpeg/id3v2/frames/ownershipframe.cpp

@@ -1,162 +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 "ownershipframe.h"
-#include <id3v2tag.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
-{
-  ByteVector v;
-  
-  v.append(char(d->textEncoding));
-  v.append(d->pricePaid.data(String::Latin1));
-  v.append(textDelimiter(String::Latin1));
-  v.append(d->datePurchased.data(String::Latin1));
-  v.append(d->seller.data(d->textEncoding));
- 
-  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/privateframe.cpp

@@ -98,7 +98,7 @@ void PrivateFrame::parseFields(const ByteVector &data)
   }
 
   // Owner identifier is assumed to be Latin1
-
+  
   const int byteAlign =  1;
   const int endOfOwner = data.find(textDelimiter(String::Latin1), 0, byteAlign);
 

taglib/mpeg/id3v2/frames/textidentificationframe.cpp

@@ -25,9 +25,8 @@
 
 #include <tbytevectorlist.h>
 #include <id3v2tag.h>
+
 #include "textidentificationframe.h"
-#include "tpropertymap.h"
-#include "id3v1genres.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -58,32 +57,6 @@ TextIdentificationFrame::TextIdentificationFrame(const ByteVector &data) :
   setData(data);
 }
 
-TextIdentificationFrame *TextIdentificationFrame::createTIPLFrame(const PropertyMap &properties) // static
-{
-  TextIdentificationFrame *frame = new TextIdentificationFrame("TIPL");
-  StringList l;
-  for(PropertyMap::ConstIterator it = properties.begin(); it != properties.end(); ++it){
-    l.append(it->first);
-    l.append(it->second.toString(",")); // comma-separated list of names
-  }
-  frame->setText(l);
-  return frame;
-}
-
-TextIdentificationFrame *TextIdentificationFrame::createTMCLFrame(const PropertyMap &properties) // static
-{
-  TextIdentificationFrame *frame = new TextIdentificationFrame("TMCL");
-  StringList l;
-  for(PropertyMap::ConstIterator it = properties.begin(); it != properties.end(); ++it){
-    if(!it->first.startsWith(instrumentPrefix)) // should not happen
-      continue;
-    l.append(it->first.substr(instrumentPrefix.size()));
-    l.append(it->second.toString(","));
-  }
-  frame->setText(l);
-  return frame;
-}
-
 TextIdentificationFrame::~TextIdentificationFrame()
 {
   delete d;
@@ -119,61 +92,6 @@ void TextIdentificationFrame::setTextEncoding(String::Type encoding)
   d->textEncoding = encoding;
 }
 
-// array of allowed TIPL prefixes and their corresponding key value
-static const TagLib::uint involvedPeopleSize = 5;
-static const char* involvedPeople[][2] = {
-    {"ARRANGER", "ARRANGER"},
-    {"ENGINEER", "ENGINEER"},
-    {"PRODUCER", "PRODUCER"},
-    {"DJ-MIX", "DJMIXER"},
-    {"MIX", "MIXER"},
-};
-
-const KeyConversionMap &TextIdentificationFrame::involvedPeopleMap() // static
-{
-  static KeyConversionMap m;
-  if(m.isEmpty())
-    for(uint i = 0; i < involvedPeopleSize; ++i)
-      m.insert(involvedPeople[i][1], involvedPeople[i][0]);
-  return m;
-}
-
-PropertyMap TextIdentificationFrame::asProperties() const
-{
-  if(frameID() == "TIPL")
-    return makeTIPLProperties();
-  if(frameID() == "TMCL")
-    return makeTMCLProperties();
-  PropertyMap map;
-  String tagName = frameIDToKey(frameID());
-  if(tagName.isNull()) {
-    map.unsupportedData().append(frameID());
-    return map;
-  }
-  StringList values = fieldList();
-  if(tagName == "GENRE") {
-    // Special case: Support ID3v1-style genre numbers. They are not officially supported in
-    // ID3v2, however it seems that still a lot of programs use them.
-    for(StringList::Iterator it = values.begin(); it != values.end(); ++it) {
-      bool ok = false;
-      int test = it->toInt(&ok); // test if the genre value is an integer
-      if(ok)
-        *it = ID3v1::genre(test);
-    }
-  } else if(tagName == "DATE") {
-    for(StringList::Iterator it = values.begin(); it != values.end(); ++it) {
-      // ID3v2 specifies ISO8601 timestamps which contain a 'T' as separator between date and time.
-      // Since this is unusual in other formats, the T is removed.
-      int tpos = it->find("T");
-      if(tpos != -1)
-        (*it)[tpos] = ' ';
-    }
-  }
-  PropertyMap ret;
-  ret.insert(tagName, values);
-  return ret;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // TextIdentificationFrame protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -213,10 +131,8 @@ void TextIdentificationFrame::parseFields(const ByteVector &data)
 
   for(ByteVectorList::Iterator it = l.begin(); it != l.end(); it++) {
     if(!(*it).isEmpty()) {
-      if(d->textEncoding == String::Latin1)
-        d->fieldList.append(Tag::latin1StringHandler()->parse(*it));
-      else
-        d->fieldList.append(String(*it, d->textEncoding));    
+      String s(*it, d->textEncoding);
+      d->fieldList.append(s);
     }
   }
 }
@@ -254,55 +170,6 @@ TextIdentificationFrame::TextIdentificationFrame(const ByteVector &data, Header
   parseFields(fieldData(data));
 }
 
-PropertyMap TextIdentificationFrame::makeTIPLProperties() const
-{
-  PropertyMap map;
-  if(fieldList().size() % 2 != 0){
-    // according to the ID3 spec, TIPL must contain an even number of entries
-    map.unsupportedData().append(frameID());
-    return map;
-  }
-  StringList l = fieldList();
-  for(StringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-    bool found = false;
-    for(uint i = 0; i < involvedPeopleSize; ++i)
-      if(*it == involvedPeople[i][0]) {
-        map.insert(involvedPeople[i][1], (++it)->split(","));
-        found = true;
-        break;
-      }
-    if(!found){
-      // invalid involved role -> mark whole frame as unsupported in order to be consisten with writing
-      map.clear();
-      map.unsupportedData().append(frameID());
-      return map;
-    }
-  }
-  return map;
-}
-
-PropertyMap TextIdentificationFrame::makeTMCLProperties() const
-{
-  PropertyMap map;
-  if(fieldList().size() % 2 != 0){
-    // according to the ID3 spec, TMCL must contain an even number of entries
-    map.unsupportedData().append(frameID());
-    return map;
-  }
-  StringList l = fieldList();
-  for(StringList::ConstIterator it = l.begin(); it != l.end(); ++it) {
-    String instrument = it->upper();
-    if(instrument.isNull()) {
-      // instrument is not a valid key -> frame unsupported
-      map.clear();
-      map.unsupportedData().append(frameID());
-      return map;
-    }
-    map.insert(L"PERFORMER:" + instrument, (++it)->split(","));
-  }
-  return map;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // UserTextIdentificationFrame public members
 ////////////////////////////////////////////////////////////////////////////////
@@ -324,14 +191,6 @@ UserTextIdentificationFrame::UserTextIdentificationFrame(const ByteVector &data)
   checkFields();
 }
 
-UserTextIdentificationFrame::UserTextIdentificationFrame(const String &description, const StringList &values, String::Type encoding) :
-    TextIdentificationFrame("TXXX", encoding),
-    d(0)
-{
-  setDescription(description);
-  setText(values);
-}
-
 String UserTextIdentificationFrame::toString() const
 {
   return "[" + description() + "] " + fieldList().toString();
@@ -379,23 +238,6 @@ void UserTextIdentificationFrame::setDescription(const String &s)
   TextIdentificationFrame::setText(l);
 }
 
-PropertyMap UserTextIdentificationFrame::asProperties() const
-{
-  String tagName = description();
-
-  PropertyMap map;
-  String key = tagName.upper();
-  if(key.isNull()) // this frame's description is not a valid PropertyMap key -> add to unsupported list
-    map.unsupportedData().append(L"TXXX/" + description());
-  else {
-    StringList v = fieldList();
-    for(StringList::ConstIterator it = v.begin(); it != v.end(); ++it)
-      if(*it != description())
-        map.insert(key, *it);
-  }
-  return map;
-}
-
 UserTextIdentificationFrame *UserTextIdentificationFrame::find(
   ID3v2::Tag *tag, const String &description) // static
 {

taglib/mpeg/id3v2/frames/textidentificationframe.h

@@ -27,7 +27,6 @@
 #define TAGLIB_TEXTIDENTIFICATIONFRAME_H
 
 #include "tstringlist.h"
-#include "tmap.h"
 #include "taglib_export.h"
 
 #include "id3v2frame.h"
@@ -37,7 +36,6 @@ namespace TagLib {
   namespace ID3v2 {
 
     class Tag;
-    typedef Map<String, String> KeyConversionMap;
 
     //! An ID3v2 text identification frame implementation
 
@@ -125,20 +123,6 @@ namespace TagLib {
        */
       explicit TextIdentificationFrame(const ByteVector &data);
 
-      /*!
-       * This is a special factory method to create a TIPL (involved people list)
-       * frame from the given \a properties. Will parse key=[list of values] data
-       * into the TIPL format as specified in the ID3 standard.
-       */
-      static TextIdentificationFrame *createTIPLFrame(const PropertyMap &properties);
-
-      /*!
-       * This is a special factory method to create a TMCL (musician credits list)
-       * frame from the given \a properties. Will parse key=[list of values] data
-       * into the TMCL format as specified in the ID3 standard, where key should be
-       * of the form instrumentPrefix:instrument.
-       */
-      static TextIdentificationFrame *createTMCLFrame(const PropertyMap &properties);
       /*!
        * Destroys this TextIdentificationFrame instance.
        */
@@ -189,14 +173,6 @@ namespace TagLib {
        */
       StringList fieldList() const;
 
-      /*!
-       * Returns a KeyConversionMap mapping a role as it would be  used in a PropertyMap
-       * to the corresponding key used in a TIPL ID3 frame to describe that role.
-       */
-      static const KeyConversionMap &involvedPeopleMap();
-
-      PropertyMap asProperties() const;
-
     protected:
       // Reimplementations.
 
@@ -212,16 +188,6 @@ namespace TagLib {
       TextIdentificationFrame(const TextIdentificationFrame &);
       TextIdentificationFrame &operator=(const TextIdentificationFrame &);
 
-      /*!
-       * Parses the special structure of a TIPL frame
-       * Only the whitelisted roles "ARRANGER", "ENGINEER", "PRODUCER",
-       * "DJMIXER" (ID3: "DJ-MIX") and "MIXER" (ID3: "MIX") are allowed.
-       */
-      PropertyMap makeTIPLProperties() const;
-      /*!
-       * Parses the special structure of a TMCL frame.
-       */
-      PropertyMap makeTMCLProperties() const;
       class TextIdentificationFramePrivate;
       TextIdentificationFramePrivate *d;
     };
@@ -252,12 +218,6 @@ namespace TagLib {
        */
       explicit UserTextIdentificationFrame(const ByteVector &data);
 
-      /*!
-       * Creates a user defined text identification frame with the given \a description
-       * and \a values.
-       */
-      UserTextIdentificationFrame(const String &description, const StringList &values, String::Type encoding = String::UTF8);
-
       virtual String toString() const;
 
       /*!
@@ -276,21 +236,6 @@ namespace TagLib {
       void setText(const String &text);
       void setText(const StringList &fields);
 
-      /*!
-       * A UserTextIdentificationFrame is parsed into a PropertyMap as follows:
-       * - the key is the frame's description, uppercased
-       * - if the description contains '::', only the substring after that
-       *   separator is considered as key (compatibility with exfalso)
-       * - if the above rules don't yield a valid key (e.g. containing non-ASCII
-       *   characters), the returned map will contain an entry "TXXX/<description>"
-       *   in its unsupportedData() list.
-       * - The values will be copies of the fieldList().
-       * - If the description() appears as value in fieldList(), it will be omitted
-       *   in the value list, in order to be compatible with TagLib which copies
-       *   the description() into the fieldList().
-       */
-      PropertyMap asProperties() const;
-
       /*!
        * Searches for the user defined text frame with the description \a description
        * in \a tag.  This returns null if no matching frames were found.

taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h

@@ -100,7 +100,7 @@ namespace TagLib {
 
     private:
       UniqueFileIdentifierFrame(const UniqueFileIdentifierFrame &);
-      UniqueFileIdentifierFrame &operator=(const UniqueFileIdentifierFrame &);
+      UniqueFileIdentifierFrame &operator=(UniqueFileIdentifierFrame &);
 
       UniqueFileIdentifierFrame(const ByteVector &data, Header *h);
 

taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp

@@ -27,9 +27,7 @@
 
 #include "unsynchronizedlyricsframe.h"
 #include <tbytevectorlist.h>
-#include <id3v2tag.h>
 #include <tdebug.h>
-#include <tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -113,30 +111,6 @@ void UnsynchronizedLyricsFrame::setTextEncoding(String::Type encoding)
   d->textEncoding = encoding;
 }
 
-PropertyMap UnsynchronizedLyricsFrame::asProperties() const
-{
-  PropertyMap map;
-  String key = description().upper();
-  if(key.isEmpty() || key.upper() == "LYRICS")
-    map.insert("LYRICS", text());
-  else if(key.isNull())
-    map.unsupportedData().append(L"USLT/" + description());
-  else
-    map.insert("LYRICS:" + key, text());
-  return map;
-}
-
-UnsynchronizedLyricsFrame *UnsynchronizedLyricsFrame::findByDescription(const ID3v2::Tag *tag, const String &d) // static
-{
-  ID3v2::FrameList lyrics = tag->frameList("USLT");
-
-  for(ID3v2::FrameList::ConstIterator it = lyrics.begin(); it != lyrics.end(); ++it){
-    UnsynchronizedLyricsFrame *frame = dynamic_cast<UnsynchronizedLyricsFrame *>(*it);
-    if(frame && frame->description() == d)
-      return frame;
-  }
-  return 0;
-}
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -158,13 +132,8 @@ void UnsynchronizedLyricsFrame::parseFields(const ByteVector &data)
     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/unsynchronizedlyricsframe.h

@@ -134,28 +134,6 @@ namespace TagLib {
        */
       void setTextEncoding(String::Type encoding);
 
-
-      /*! Parses this frame as PropertyMap with a single key.
-       * - if description() is empty or "LYRICS", the key will be "LYRICS"
-       * - if description() is not a valid PropertyMap key, the frame will be
-       *   marked unsupported by an entry "USLT/<description>" in the unsupportedData()
-       *   attribute of the returned map.
-       * - otherwise, the key will be "LYRICS:<description>"
-       * - The single value will be the frame's text().
-       * Note that currently the language() field is not supported by the PropertyMap
-       * interface.
-       */
-      PropertyMap asProperties() const;
-
-      /*!
-       * LyricsFrames each have a unique description.  This searches for a lyrics
-       * 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()
-       */
-      static UnsynchronizedLyricsFrame *findByDescription(const Tag *tag, const String &d);
-
     protected:
       // Reimplementations.
 

taglib/mpeg/id3v2/frames/urllinkframe.cpp

@@ -26,10 +26,8 @@
  ***************************************************************************/
 
 #include "urllinkframe.h"
-#include "id3v2tag.h"
 #include <tdebug.h>
 #include <tstringlist.h>
-#include <tpropertymap.h>
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -80,18 +78,6 @@ String UrlLinkFrame::toString() const
   return url();
 }
 
-PropertyMap UrlLinkFrame::asProperties() const
-{
-  String key = frameIDToKey(frameID());
-  PropertyMap map;
-  if(key.isNull())
-    // unknown W*** frame - this normally shouldn't happen
-    map.unsupportedData().append(frameID());
-  else
-    map.insert(key, url());
-  return map;
-}
-
 void UrlLinkFrame::parseFields(const ByteVector &data)
 {
   d->url = String(data);
@@ -153,30 +139,6 @@ void UserUrlLinkFrame::setDescription(const String &s)
   d->description = s;
 }
 
-PropertyMap UserUrlLinkFrame::asProperties() const
-{
-  PropertyMap map;
-  String key = description().upper();
-  if(key.isEmpty() || key.upper() == "URL")
-    map.insert("URL", url());
-  else if(key.isNull())
-    map.unsupportedData().append(L"WXXX/" + description());
-  else
-    map.insert("URL:" + key, url());
-  return map;
-}
-
-UserUrlLinkFrame *UserUrlLinkFrame::find(ID3v2::Tag *tag, const String &description) // static
-{
-  FrameList l = tag->frameList("WXXX");
-  for(FrameList::Iterator it = l.begin(); it != l.end(); ++it) {
-    UserUrlLinkFrame *f = dynamic_cast<UserUrlLinkFrame *>(*it);
-    if(f && f->description() == description)
-      return f;
-  }
-  return 0;
-}
-
 void UserUrlLinkFrame::parseFields(const ByteVector &data)
 {
   if(data.size() < 2) {

taglib/mpeg/id3v2/frames/urllinkframe.h

@@ -68,7 +68,6 @@ namespace TagLib {
 
       virtual void setText(const String &s);
       virtual String toString() const;
-      PropertyMap asProperties() const;
 
     protected:
       virtual void parseFields(const ByteVector &data);
@@ -151,22 +150,6 @@ namespace TagLib {
        */
       void setDescription(const String &s);
 
-      /*!
-       * Parses the UserUrlLinkFrame as PropertyMap. The description() is taken as key,
-       * and the URL as single value.
-       * - if description() is empty, the key will be "URL".
-       * - otherwise, if description() is not a valid key (e.g. containing non-ASCII
-       *   characters), the returned map will contain an entry "WXXX/<description>"
-       *   in its unsupportedData() list.
-       */
-      PropertyMap asProperties() const;
-
-      /*!
-       * Searches for the user defined url frame with the description \a description
-       * in \a tag.  This returns null if no matching frames were found.
-       */
-      static UserUrlLinkFrame *find(Tag *tag, const String &description);
-
     protected:
       virtual void parseFields(const ByteVector &data);
       virtual ByteVector renderFields() const;

taglib/mpeg/id3v2/id3v2frame.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
+#ifndef HAVE_ZLIB
 #include <config.h>
 #endif
 
@@ -36,15 +36,8 @@
 #include <tdebug.h>
 #include <tstringlist.h>
 
-#include "id3v2tag.h"
 #include "id3v2frame.h"
 #include "id3v2synchdata.h"
-#include "tpropertymap.h"
-#include "frames/textidentificationframe.h"
-#include "frames/urllinkframe.h"
-#include "frames/unsynchronizedlyricsframe.h"
-#include "frames/commentsframe.h"
-#include "frames/unknownframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -72,7 +65,7 @@ namespace
       return false;
 
     for(ByteVector::ConstIterator it = frameID.begin(); it != frameID.end(); it++) {
-      if( (*it < 'A' || *it > 'Z') && (*it < '0' || *it > '9') ) {
+      if( (*it < 'A' || *it > 'Z') && (*it < '1' || *it > '9') ) {
         return false;
       }
     }
@@ -102,56 +95,10 @@ ByteVector Frame::textDelimiter(String::Type t)
   return d;
 }
 
-const String Frame::instrumentPrefix("PERFORMER:");
-const String Frame::commentPrefix("COMMENT:");
-const String Frame::lyricsPrefix("LYRICS:");
-const String Frame::urlPrefix("URL:");
-
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-Frame *Frame::createTextualFrame(const String &key, const StringList &values) //static
-{
-  // check if the key is contained in the key<=>frameID mapping
-  ByteVector frameID = keyToFrameID(key);
-  if(!frameID.isNull()) {
-    if(frameID[0] == 'T'){ // text frame
-      TextIdentificationFrame *frame = new TextIdentificationFrame(frameID, String::UTF8);
-      frame->setText(values);
-      return frame;
-    } else if(values.size() == 1){  // URL frame (not WXXX); support only one value
-        UrlLinkFrame* frame = new UrlLinkFrame(frameID);
-        frame->setUrl(values.front());
-        return frame;
-    }
-  }
-  // now we check if it's one of the "special" cases:
-  // -LYRICS: depending on the number of values, use USLT or TXXX (with description=LYRICS)
-  if((key == "LYRICS" || key.startsWith(lyricsPrefix)) && values.size() == 1){
-    UnsynchronizedLyricsFrame *frame = new UnsynchronizedLyricsFrame();
-    frame->setDescription(key == "LYRICS" ? key : key.substr(lyricsPrefix.size()));
-    frame->setText(values.front());
-    return frame;
-  }
-  // -URL: depending on the number of values, use WXXX or TXXX (with description=URL)
-  if((key == "URL" || key.startsWith(urlPrefix)) && values.size() == 1){
-    UserUrlLinkFrame *frame = new UserUrlLinkFrame(String::UTF8);
-    frame->setDescription(key == "URL" ? key : key.substr(urlPrefix.size()));
-    frame->setUrl(values.front());
-    return frame;
-  }
-  // -COMMENT: depending on the number of values, use COMM or TXXX (with description=COMMENT)
-  if((key == "COMMENT" || key.startsWith(commentPrefix)) && values.size() == 1){
-    CommentsFrame *frame = new CommentsFrame(String::UTF8);
-    frame->setDescription(key == "COMMENT" ? key : key.substr(commentPrefix.size()));
-    frame->setText(values.front());
-    return frame;
-  }
-  // if non of the above cases apply, we use a TXXX frame with the key as description
-  return new UserTextIdentificationFrame(key, values, String::UTF8);
-}
-
 Frame::~Frame()
 {
   delete d;
@@ -274,11 +221,7 @@ String Frame::readStringField(const ByteVector &data, String::Type encoding, int
   if(end < *position)
     return String::null;
 
-  String str;
-  if(encoding == String::Latin1)
-    str = Tag::latin1StringHandler()->parse(data.mid(*position, end - *position));
-  else
-    str = String(data.mid(*position, end - *position), encoding);
+  String str = String(data.mid(*position, end - *position), encoding);
 
   *position = end + delimiter.size();
 
@@ -319,163 +262,6 @@ String::Type Frame::checkTextEncoding(const StringList &fields, String::Type enc
   return checkEncoding(fields, encoding, header()->version());
 }
 
-static const TagLib::uint frameTranslationSize = 51;
-static const char *frameTranslation[][2] = {
-  // Text information frames
-  { "TALB", "ALBUM"},
-  { "TBPM", "BPM" },
-  { "TCOM", "COMPOSER" },
-  { "TCON", "GENRE" },
-  { "TCOP", "COPYRIGHT" },
-  { "TDEN", "ENCODINGTIME" },
-  { "TDLY", "PLAYLISTDELAY" },
-  { "TDOR", "ORIGINALDATE" },
-  { "TDRC", "DATE" },
-  // { "TRDA", "DATE" }, // id3 v2.3, replaced by TDRC in v2.4
-  // { "TDAT", "DATE" }, // id3 v2.3, replaced by TDRC in v2.4
-  // { "TYER", "DATE" }, // id3 v2.3, replaced by TDRC in v2.4
-  // { "TIME", "DATE" }, // id3 v2.3, replaced by TDRC in v2.4
-  { "TDRL", "RELEASEDATE" },
-  { "TDTG", "TAGGINGDATE" },
-  { "TENC", "ENCODEDBY" },
-  { "TEXT", "LYRICIST" },
-  { "TFLT", "FILETYPE" },
-  //{ "TIPL", "INVOLVEDPEOPLE" }, handled separately
-  { "TIT1", "CONTENTGROUP" },
-  { "TIT2", "TITLE"},
-  { "TIT3", "SUBTITLE" },
-  { "TKEY", "INITIALKEY" },
-  { "TLAN", "LANGUAGE" },
-  { "TLEN", "LENGTH" },
-  //{ "TMCL", "MUSICIANCREDITS" }, handled separately
-  { "TMED", "MEDIATYPE" },
-  { "TMOO", "MOOD" },
-  { "TOAL", "ORIGINALALBUM" },
-  { "TOFN", "ORIGINALFILENAME" },
-  { "TOLY", "ORIGINALLYRICIST" },
-  { "TOPE", "ORIGINALARTIST" },
-  { "TOWN", "OWNER" },
-  { "TPE1", "ARTIST"},
-  { "TPE2", "ALBUMARTIST" }, // id3's spec says 'PERFORMER', but most programs use 'ALBUMARTIST'
-  { "TPE3", "CONDUCTOR" },
-  { "TPE4", "REMIXER" }, // could also be ARRANGER
-  { "TPOS", "DISCNUMBER" },
-  { "TPRO", "PRODUCEDNOTICE" },
-  { "TPUB", "PUBLISHER" },
-  { "TRCK", "TRACKNUMBER" },
-  { "TRSN", "RADIOSTATION" },
-  { "TRSO", "RADIOSTATIONOWNER" },
-  { "TSOA", "ALBUMSORT" },
-  { "TSOP", "ARTISTSORT" },
-  { "TSOT", "TITLESORT" },
-  { "TSO2", "ALBUMARTISTSORT" }, // non-standard, used by iTunes
-  { "TSRC", "ISRC" },
-  { "TSSE", "ENCODING" },
-  // URL frames
-  { "WCOP", "COPYRIGHTURL" },
-  { "WOAF", "FILEWEBPAGE" },
-  { "WOAR", "ARTISTWEBPAGE" },
-  { "WOAS", "AUDIOSOURCEWEBPAGE" },
-  { "WORS", "RADIOSTATIONWEBPAGE" },
-  { "WPAY", "PAYMENTWEBPAGE" },
-  { "WPUB", "PUBLISHERWEBPAGE" },
-  //{ "WXXX", "URL"}, handled specially
-  // Other frames
-  { "COMM", "COMMENT" },
-  //{ "USLT", "LYRICS" }, handled specially
-};
-
-Map<ByteVector, String> &idMap()
-{
-  static Map<ByteVector, String> m;
-  if(m.isEmpty())
-    for(size_t i = 0; i < frameTranslationSize; ++i)
-      m[frameTranslation[i][0]] = frameTranslation[i][1];
-  return m;
-}
-
-// list of deprecated frames and their successors
-static const TagLib::uint deprecatedFramesSize = 4;
-static const char *deprecatedFrames[][2] = {
-  {"TRDA", "TDRC"}, // 2.3 -> 2.4 (http://en.wikipedia.org/wiki/ID3)
-  {"TDAT", "TDRC"}, // 2.3 -> 2.4
-  {"TYER", "TDRC"}, // 2.3 -> 2.4
-  {"TIME", "TDRC"}, // 2.3 -> 2.4
-};
-
-Map<ByteVector,ByteVector> &deprecationMap()
-{
-  static Map<ByteVector,ByteVector> depMap;
-  if(depMap.isEmpty())
-    for(TagLib::uint i = 0; i < deprecatedFramesSize; ++i)
-      depMap[deprecatedFrames[i][0]] = deprecatedFrames[i][1];
-  return depMap;
-}
-
-String Frame::frameIDToKey(const ByteVector &id)
-{
-  Map<ByteVector, String> &m = idMap();
-  if(m.contains(id))
-    return m[id];
-  if(deprecationMap().contains(id))
-    return m[deprecationMap()[id]];
-  return String::null;
-}
-
-ByteVector Frame::keyToFrameID(const String &s)
-{
-  static Map<String, ByteVector> m;
-  if(m.isEmpty())
-    for(size_t i = 0; i < frameTranslationSize; ++i)
-      m[frameTranslation[i][1]] = frameTranslation[i][0];
-  if(m.contains(s.upper()))
-    return m[s];
-  return ByteVector::null;
-}
-
-PropertyMap Frame::asProperties() const
-{
-  if(dynamic_cast< const UnknownFrame *>(this)) {
-    PropertyMap m;
-    m.unsupportedData().append("UNKNOWN/" + frameID());
-    return m;
-  }
-  const ByteVector &id = frameID();
-  // workaround until this function is virtual
-  if(id == "TXXX")
-    return dynamic_cast< const UserTextIdentificationFrame* >(this)->asProperties();
-  else if(id[0] == 'T')
-    return dynamic_cast< const TextIdentificationFrame* >(this)->asProperties();
-  else if(id == "WXXX")
-    return dynamic_cast< const UserUrlLinkFrame* >(this)->asProperties();
-  else if(id[0] == 'W')
-    return dynamic_cast< const UrlLinkFrame* >(this)->asProperties();
-  else if(id == "COMM")
-    return dynamic_cast< const CommentsFrame* >(this)->asProperties();
-  else if(id == "USLT")
-    return dynamic_cast< const UnsynchronizedLyricsFrame* >(this)->asProperties();
-  PropertyMap m;
-  m.unsupportedData().append(id);
-  return m;
-}
-
-void Frame::splitProperties(const PropertyMap &original, PropertyMap &singleFrameProperties,
-          PropertyMap &tiplProperties, PropertyMap &tmclProperties)
-{
-
-  singleFrameProperties.clear();
-  tiplProperties.clear();
-  tmclProperties.clear();
-  for(PropertyMap::ConstIterator it = original.begin(); it != original.end(); ++it) {
-    if(TextIdentificationFrame::involvedPeopleMap().contains(it->first))
-      tiplProperties.insert(it->first, it->second);
-    else if(it->first.startsWith(TextIdentificationFrame::instrumentPrefix))
-      tmclProperties.insert(it->first, it->second);
-    else
-      singleFrameProperties.insert(it->first, it->second);
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // Frame::Header class
 ////////////////////////////////////////////////////////////////////////////////

taglib/mpeg/id3v2/id3v2frame.h

@@ -33,7 +33,6 @@
 namespace TagLib {
 
   class StringList;
-  class PropertyMap;
 
   namespace ID3v2 {
 
@@ -57,14 +56,6 @@ namespace TagLib {
       friend class FrameFactory;
 
     public:
-
-      /*!
-       * Creates a textual frame which corresponds to a single key in the PropertyMap
-       * interface. These are all (User)TextIdentificationFrames except TIPL and TMCL,
-       * all (User)URLLinkFrames, CommentsFrames, and UnsynchronizedLyricsFrame.
-       */
-      static Frame *createTextualFrame(const String &key, const StringList &values);
-
       /*!
        * Destroys this Frame instance.
        */
@@ -135,28 +126,6 @@ namespace TagLib {
        */
       static ByteVector textDelimiter(String::Type t);
 
-      /*!
-       * The string with which an instrument name is prefixed to build a key in a PropertyMap;
-       * used to translate PropertyMaps to TMCL frames. In the current implementation, this
-       * is "PERFORMER:".
-       */
-      static const String instrumentPrefix;
-      /*!
-       * The PropertyMap key prefix which triggers the use of a COMM frame instead of a TXXX
-       * frame for a non-standard key. In the current implementation, this is "COMMENT:".
-       */
-      static const String commentPrefix;
-      /*!
-       * The PropertyMap key prefix which triggers the use of a USLT frame instead of a TXXX
-       * frame for a non-standard key. In the current implementation, this is "LYRICS:".
-       */
-      static const String lyricsPrefix;
-      /*!
-       * The PropertyMap key prefix which triggers the use of a WXXX frame instead of a TXX
-       * frame for a non-standard key. In the current implementation, this is "URL:".
-       */
-      static const String urlPrefix;
-
     protected:
       class Header;
 
@@ -253,44 +222,6 @@ namespace TagLib {
       String::Type checkTextEncoding(const StringList &fields,
                                      String::Type encoding) const;
 
-
-      /*!
-       * Parses the contents of this frame as PropertyMap. If that fails, the returend
-       * PropertyMap will be empty, and its unsupportedData() will contain this frame's
-       * ID.
-       * BIC: Will be a virtual function in future releases.
-       */
-      PropertyMap asProperties() const;
-
-      /*!
-       * Returns an appropriate ID3 frame ID for the given free-form tag key. This method
-       * will return ByteVector::null if no specialized translation is found.
-       */
-      static ByteVector keyToFrameID(const String &);
-
-      /*!
-       * Returns a free-form tag name for the given ID3 frame ID. Note that this does not work
-       * for general frame IDs such as TXXX or WXXX; in such a case String::null is returned.
-       */
-      static String frameIDToKey(const ByteVector &);
-
-
-      /*!
-       * This helper function splits the PropertyMap \a original into three ProperytMaps
-       * \a singleFrameProperties, \a tiplProperties, and \a tmclProperties, such that:
-       * - \a singleFrameProperties contains only of keys which can be represented with
-       *   exactly one ID3 frame per key. In the current implementation
-       *   this is everything except for the fixed "involved people" keys and keys of the
-       *   form "TextIdentificationFrame::instrumentPrefix" + "instrument", which are
-       *   mapped to a TMCL frame.
-       * - \a tiplProperties will consist of those keys that are present in
-       *   TextIdentificationFrame::involvedPeopleMap()
-       * - \a tmclProperties contains the "musician credits" keys which should be mapped
-       *   to a TMCL frame
-       */
-      static void splitProperties(const PropertyMap &original, PropertyMap &singleFrameProperties,
-          PropertyMap &tiplProperties, PropertyMap &tmclProperties);
-
     private:
       Frame(const Frame &);
       Frame &operator=(const Frame &);

taglib/mpeg/id3v2/id3v2framefactory.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#ifdef HAVE_CONFIG_H
+#ifndef HAVE_ZLIB
 #include <config.h>
 #endif
 
@@ -44,7 +44,6 @@
 #include "frames/unsynchronizedlyricsframe.h"
 #include "frames/popularimeterframe.h"
 #include "frames/privateframe.h"
-#include "frames/ownershipframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -66,7 +65,7 @@ public:
   }
 };
 
-FrameFactory FrameFactory::factory;
+FrameFactory *FrameFactory::factory = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
@@ -74,7 +73,9 @@ FrameFactory FrameFactory::factory;
 
 FrameFactory *FrameFactory::instance()
 {
-  return &factory;
+  if(!factory)
+    factory = new FrameFactory;
+  return factory;
 }
 
 Frame *FrameFactory::createFrame(const ByteVector &data, bool synchSafeInts) const
@@ -108,7 +109,7 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
   }
 
   for(ByteVector::ConstIterator it = frameID.begin(); it != frameID.end(); it++) {
-    if( (*it < 'A' || *it > 'Z') && (*it < '0' || *it > '9') ) {
+    if( (*it < 'A' || *it > 'Z') && (*it < '1' || *it > '9') ) {
       delete header;
       return 0;
     }
@@ -239,14 +240,6 @@ Frame *FrameFactory::createFrame(const ByteVector &origData, Header *tagHeader)
 
   if(frameID == "PRIV")
     return new PrivateFrame(data, header);
-  
-  // Ownership (frames 4.22)
-  
-  if(frameID == "OWNE") {
-    OwnershipFrame *f = new OwnershipFrame(data, header);
-    d->setTextEncoding(f);
-    return f;
-  }
 
   return new UnknownFrame(data, header);
 }
@@ -317,7 +310,6 @@ bool FrameFactory::updateFrame(Frame::Header *header) const
     convertFrame("TBP", "TBPM", header);
     convertFrame("TCM", "TCOM", header);
     convertFrame("TCO", "TCON", header);
-    convertFrame("TCP", "TCMP", header);
     convertFrame("TCR", "TCOP", header);
     convertFrame("TDY", "TDLY", header);
     convertFrame("TEN", "TENC", header);
@@ -340,12 +332,7 @@ bool FrameFactory::updateFrame(Frame::Header *header) const
     convertFrame("TRC", "TSRC", header);
     convertFrame("TRD", "TDRC", header);
     convertFrame("TRK", "TRCK", header);
-    convertFrame("TS2", "TSO2", header);
-    convertFrame("TSA", "TSOA", header);
-    convertFrame("TSC", "TSOC", header);
-    convertFrame("TSP", "TSOP", header);
     convertFrame("TSS", "TSSE", header);
-    convertFrame("TST", "TSOT", header);
     convertFrame("TT1", "TIT1", header);
     convertFrame("TT2", "TIT2", header);
     convertFrame("TT3", "TIT3", header);

taglib/mpeg/id3v2/id3v2framefactory.h

@@ -123,7 +123,8 @@ namespace TagLib {
       FrameFactory();
 
       /*!
-       * Destroys the frame factory.
+       * Destroys the frame factory.  In most cases this will never be called (as
+       * is typical of singletons).
        */
       virtual ~FrameFactory();
 
@@ -154,7 +155,7 @@ namespace TagLib {
 
       void updateGenre(TextIdentificationFrame *frame) const;
 
-      static FrameFactory factory;
+      static FrameFactory *factory;
 
       class FrameFactoryPrivate;
       FrameFactoryPrivate *d;

taglib/mpeg/id3v2/id3v2header.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <iostream>
+#include <ostream>
 #include <bitset>
 
 #include <tstring.h>

taglib/mpeg/id3v2/id3v2synchdata.cpp

@@ -23,7 +23,7 @@
  *   http://www.mozilla.org/MPL/                                           *
  ***************************************************************************/
 
-#include <iostream>
+#include <ostream>
 
 #include "id3v2synchdata.h"
 

taglib/mpeg/id3v2/id3v2tag.cpp

@@ -24,23 +24,18 @@
  ***************************************************************************/
 
 #include <tfile.h>
+#include <tdebug.h>
 
 #include "id3v2tag.h"
 #include "id3v2header.h"
 #include "id3v2extendedheader.h"
 #include "id3v2footer.h"
 #include "id3v2synchdata.h"
-#include "tbytevector.h"
+
 #include "id3v1genres.h"
-#include "tpropertymap.h"
-#include <tdebug.h>
 
 #include "frames/textidentificationframe.h"
 #include "frames/commentsframe.h"
-#include "frames/urllinkframe.h"
-#include "frames/uniquefileidentifierframe.h"
-#include "frames/unsynchronizedlyricsframe.h"
-#include "frames/unknownframe.h"
 
 using namespace TagLib;
 using namespace ID3v2;
@@ -70,30 +65,8 @@ public:
 
   FrameListMap frameListMap;
   FrameList frameList;
-
-  static const Latin1StringHandler *stringHandler;
 };
 
-static const Latin1StringHandler defaultStringHandler;
-const ID3v2::Latin1StringHandler *ID3v2::Tag::TagPrivate::stringHandler = &defaultStringHandler;
-
-////////////////////////////////////////////////////////////////////////////////
-// StringHandler implementation
-////////////////////////////////////////////////////////////////////////////////
-
-Latin1StringHandler::Latin1StringHandler()
-{
-}
-
-Latin1StringHandler::~Latin1StringHandler()
-{
-}
-
-String Latin1StringHandler::parse(const ByteVector &data) const
-{
-  return String(data, String::Latin1);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // public members
 ////////////////////////////////////////////////////////////////////////////////
@@ -351,99 +324,9 @@ void ID3v2::Tag::removeFrame(Frame *frame, bool del)
 
 void ID3v2::Tag::removeFrames(const ByteVector &id)
 {
-  FrameList l = d->frameListMap[id];
-  for(FrameList::Iterator it = l.begin(); it != l.end(); ++it)
-    removeFrame(*it, true);
-}
-
-PropertyMap ID3v2::Tag::properties() const
-{
-  PropertyMap properties;
-  for(FrameList::ConstIterator it = frameList().begin(); it != frameList().end(); ++it) {
-    PropertyMap props = (*it)->asProperties();
-    properties.merge(props);
-  }
-  return properties;
-}
-
-void ID3v2::Tag::removeUnsupportedProperties(const StringList &properties)
-{
-  for(StringList::ConstIterator it = properties.begin(); it != properties.end(); ++it){
-    if(it->startsWith("UNKNOWN/")) {
-      String frameID = it->substr(String("UNKNOWN/").size());
-      if(frameID.size() != 4)
-        continue; // invalid specification
-      ByteVector id = frameID.data(String::Latin1);
-      // delete all unknown frames of given type
-      FrameList l = frameList(id);
-      for(FrameList::ConstIterator fit = l.begin(); fit != l.end(); fit++)
-        if (dynamic_cast<const UnknownFrame *>(*fit) != 0)
-          removeFrame(*fit);
-    } else if(it->size() == 4){
-      ByteVector id = it->data(String::Latin1);
-      removeFrames(id);
-    } else {
-      ByteVector id = it->substr(0,4).data(String::Latin1);
-      if(it->size() <= 5)
-        continue; // invalid specification
-      String description = it->substr(5);
-      Frame *frame = 0;
-      if(id == "TXXX")
-        frame = UserTextIdentificationFrame::find(this, description);
-      else if(id == "WXXX")
-        frame = UserUrlLinkFrame::find(this, description);
-      else if(id == "COMM")
-        frame = CommentsFrame::findByDescription(this, description);
-      else if(id == "USLT")
-        frame = UnsynchronizedLyricsFrame::findByDescription(this, description);
-      if(frame)
-        removeFrame(frame);
-    }
-  }
-}
-
-PropertyMap ID3v2::Tag::setProperties(const PropertyMap &origProps)
-{
-  FrameList framesToDelete;
-  // we split up the PropertyMap into the "normal" keys and the "complicated" ones,
-  // which are those according to TIPL or TMCL frames.
-  PropertyMap properties;
-  PropertyMap tiplProperties;
-  PropertyMap tmclProperties;
-  Frame::splitProperties(origProps, properties, tiplProperties, tmclProperties);
-  for(FrameListMap::ConstIterator it = frameListMap().begin(); it != frameListMap().end(); ++it){
-    for(FrameList::ConstIterator lit = it->second.begin(); lit != it->second.end(); ++lit){
-      PropertyMap frameProperties = (*lit)->asProperties();
-      if(it->first == "TIPL") {
-        if (tiplProperties != frameProperties)
-          framesToDelete.append(*lit);
-        else
-          tiplProperties.erase(frameProperties);
-      } else if(it->first == "TMCL") {
-        if (tmclProperties != frameProperties)
-          framesToDelete.append(*lit);
-        else
-          tmclProperties.erase(frameProperties);
-      } else if(!properties.contains(frameProperties))
-        framesToDelete.append(*lit);
-      else
-        properties.erase(frameProperties);
-    }
-  }
-  for(FrameList::ConstIterator it = framesToDelete.begin(); it != framesToDelete.end(); ++it)
-    removeFrame(*it);
-
-  // now create remaining frames:
-  // start with the involved people list (TIPL)
-  if(!tiplProperties.isEmpty())
-      addFrame(TextIdentificationFrame::createTIPLFrame(tiplProperties));
-  // proceed with the musician credit list (TMCL)
-  if(!tmclProperties.isEmpty())
-      addFrame(TextIdentificationFrame::createTMCLFrame(tmclProperties));
-  // now create the "one key per frame" frames
-  for(PropertyMap::ConstIterator it = properties.begin(); it != properties.end(); ++it)
-    addFrame(Frame::createTextualFrame(it->first, it->second));
-  return PropertyMap(); // ID3 implements the complete PropertyMap interface, so an empty map is returned
+    FrameList l = d->frameListMap[id];
+    for(FrameList::Iterator it = l.begin(); it != l.end(); ++it)
+      removeFrame(*it, true);
 }
 
 ByteVector ID3v2::Tag::render() const
@@ -606,19 +489,6 @@ ByteVector ID3v2::Tag::render(int version) const
   return d->header.render() + tagData;
 }
 
-Latin1StringHandler const *ID3v2::Tag::latin1StringHandler()
-{
-  return TagPrivate::stringHandler;
-}
-
-void ID3v2::Tag::setLatin1StringHandler(const Latin1StringHandler *handler)
-{
-  if(handler)
-    TagPrivate::stringHandler = handler;
-  else
-    TagPrivate::stringHandler = &defaultStringHandler;
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // protected members
 ////////////////////////////////////////////////////////////////////////////////
@@ -680,9 +550,8 @@ void ID3v2::Tag::parse(const ByteVector &origData)
     // portion of the frame data.
 
     if(data.at(frameDataPosition) == 0) {
-      if(d->header.footerPresent()) {
+      if(d->header.footerPresent())
         debug("Padding *and* a footer found.  This is not allowed by the spec.");
-      }
 
       d->paddingSize = frameDataLength - frameDataPosition;
       return;

taglib/mpeg/id3v2/id3v2tag.h

@@ -57,36 +57,6 @@ namespace TagLib {
     typedef List<Frame *> FrameList;
     typedef Map<ByteVector, FrameList> FrameListMap;
 
-    //! An abstraction for the ISO-8859-1 string to data encoding in ID3v2 tags.
-
-    /*!
-     * ID3v2 tag can store strings in ISO-8859-1 (Latin1), and TagLib only 
-     * supports genuine ISO-8859-1 by default.  However, in practice, non 
-     * ISO-8859-1 encodings are often used instead of ISO-8859-1, such as 
-     * Windows-1252 for western languages, Shift_JIS for Japanese and so on.
-     *
-     * Here is an option to read such tags by subclassing this class,
-     * reimplementing parse() and setting your reimplementation as the default 
-     * with ID3v2::Tag::setStringHandler().
-     *
-     * \note Writing non-ISO-8859-1 tags is not implemented intentionally.
-     * Use UTF-16 or UTF-8 instead.
-     *
-     * \see ID3v2::Tag::setStringHandler()
-     */
-    class TAGLIB_EXPORT Latin1StringHandler
-    {
-    public:
-      Latin1StringHandler();
-      virtual ~Latin1StringHandler();
-
-      /*!
-       * Decode a string from \a data.  The default implementation assumes that
-       * \a data is an ISO-8859-1 (Latin1) character array.
-       */
-      virtual String parse(const ByteVector &data) const;
-    };
-
     //! The main class in the ID3v2 implementation
 
     /*!
@@ -290,56 +260,6 @@ namespace TagLib {
        */
       void removeFrames(const ByteVector &id);
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * This function does some work to translate the hard-specified ID3v2
-       * frame types into a free-form string-to-stringlist PropertyMap:
-       *  - if ID3v2 frame ID is known by Frame::frameIDToKey(), the returned
-       *    key is used
-       *  - if the frame ID is "TXXX" (user text frame), the description() is
-       *    used as key
-       *  - if the frame ID is "WXXX" (user url frame),
-       *    - if the description is empty or "URL", the key "URL" is used
-       *    - otherwise, the key "URL:<description>" is used;
-       *  - if the frame ID is "COMM" (comments frame),
-       *    - if the description is empty or "COMMENT", the key "COMMENT"
-       *      is used
-       *    - otherwise, the key "COMMENT:<description>" is used;
-       *  - if the frame ID is "USLT" (unsynchronized lyrics),
-       *    - if the description is empty or "LYRICS", the key "LYRICS" is used
-       *    - otherwise, the key "LYRICS:<description>" is used;
-       *  - if the frame ID is "TIPL" (involved peoples list), and if all the
-       *    roles defined in the frame are known in TextIdentificationFrame::involvedPeopleMap(),
-       *    then "<role>=<name>" will be contained in the returned obejct for each
-       *  - if the frame ID is "TMCL" (musician credit list), then
-       *    "PERFORMER:<instrument>=<name>" will be contained in the returned
-       *    PropertyMap for each defined musician
-       *  In any other case, the unsupportedData() of the returned object will contain
-       *  the frame's ID and, in case of a frame ID which is allowed to appear more than
-       *  once, the description, separated by a "/".
-       *
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Removes unsupported frames given by \a properties. The elements of
-       * \a properties must be taken from properties().unsupportedData(); they
-       * are of one of the following forms:
-       *  - a four-character frame ID, if the ID3 specification allows only one
-       *    frame with that ID (thus, the frame is uniquely determined)
-       *  - frameID + "/" + description(), when the ID is one of "TXXX", "WXXX",
-       *    "COMM", or "USLT",
-       *  - "UNKNOWN/" + frameID, for frames that could not be parsed by TagLib.
-       *    In that case, *all* unknown frames with the given ID will be removed.
-       */
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * See the comments in properties().
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Render the tag back to binary data, suitable to be written to disk.
        */
@@ -353,27 +273,6 @@ namespace TagLib {
        */
       // BIC: combine with the above method
       ByteVector render(int version) const;
-      
-      /*!
-       * Gets the current string handler that decides how the "Latin-1" data 
-       * will be converted to and from binary data.
-       *
-       * \see Latin1StringHandler
-       */
-      static Latin1StringHandler const *latin1StringHandler();
-
-      /*!
-       * Sets the string handler that decides how the "Latin-1" 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 Latin1StringHandler
-       */
-      static void setLatin1StringHandler(const Latin1StringHandler *handler);
 
     protected:
       /*!

taglib/mpeg/mpegfile.cpp

@@ -35,7 +35,6 @@
 
 #include "mpegfile.h"
 #include "mpegheader.h"
-#include "tpropertymap.h"
 
 using namespace TagLib;
 
@@ -57,7 +56,9 @@ public:
     ID3v1Location(-1),
     hasID3v2(false),
     hasID3v1(false),
+    hasLyrics3v2(false),
     hasAPE(false),
+    lyrics3v2Size(0),
     properties(0)
   {
 
@@ -86,7 +87,9 @@ public:
 
   bool hasID3v2;
   bool hasID3v1;
+  bool hasLyrics3v2;
   bool hasAPE;
+  long lyrics3v2Size;
 
   Properties *properties;
 };
@@ -134,40 +137,6 @@ TagLib::Tag *MPEG::File::tag() const
   return &d->tag;
 }
 
-PropertyMap MPEG::File::properties() const
-{
-  // once Tag::properties() is virtual, this case distinction could actually be done
-  // within TagUnion.
-  if(d->hasID3v2)
-    return d->tag.access<ID3v2::Tag>(ID3v2Index, false)->properties();
-  if(d->hasAPE)
-    return d->tag.access<APE::Tag>(APEIndex, false)->properties();
-  if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(ID3v1Index, false)->properties();
-  return PropertyMap();
-}
-
-void MPEG::File::removeUnsupportedProperties(const StringList &properties)
-{
-  if(d->hasID3v2)
-    d->tag.access<ID3v2::Tag>(ID3v2Index, false)->removeUnsupportedProperties(properties);
-  else if(d->hasAPE)
-    d->tag.access<APE::Tag>(APEIndex, false)->removeUnsupportedProperties(properties);
-  else if(d->hasID3v1)
-    d->tag.access<ID3v1::Tag>(ID3v1Index, false)->removeUnsupportedProperties(properties);
-}
-PropertyMap MPEG::File::setProperties(const PropertyMap &properties)
-{
-  if(d->hasID3v2)
-    return d->tag.access<ID3v2::Tag>(ID3v2Index, false)->setProperties(properties);
-  else if(d->hasAPE)
-    return d->tag.access<APE::Tag>(APEIndex, false)->setProperties(properties);
-  else if(d->hasID3v1)
-    return d->tag.access<ID3v1::Tag>(ID3v1Index, false)->setProperties(properties);
-  else
-    return d->tag.access<ID3v2::Tag>(ID3v2Index, true)->setProperties(properties);
-}
-
 MPEG::Properties *MPEG::File::audioProperties() const
 {
   return d->properties;
@@ -207,12 +176,12 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
   }
 
   // Create the tags if we've been asked to.  Copy the values from the tag that
-  // does exist into the new tag, except if the existing tag is to be stripped.
+  // does exist into the new tag.
 
-  if((tags & ID3v2) && ID3v1Tag() && !(stripOthers && !(tags & ID3v1)))
+  if((tags & ID3v2) && ID3v1Tag())
     Tag::duplicate(ID3v1Tag(), ID3v2Tag(true), false);
 
-  if((tags & ID3v1) && d->tag[ID3v2Index] && !(stripOthers && !(tags & ID3v2)))
+  if((tags & ID3v1) && d->tag[ID3v2Index])
     Tag::duplicate(ID3v2Tag(), ID3v1Tag(true), false);
 
   bool success = true;
@@ -233,6 +202,10 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
       if(ID3v1Tag())
         d->ID3v1Location = findID3v1();
 
+      // Lyrics3v2 tag location has changed, update if it exists
+      
+      findLyrics3v2();
+
       // APE tag location has changed, update if it exists
 
       if(APETag())
@@ -261,8 +234,9 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
   // Dont save an APE-tag unless one has been created
 
   if((APE & tags) && APETag()) {
-    if(d->hasAPE)
+    if(d->hasAPE) {
       insert(APETag()->render(), d->APELocation, d->APEOriginalSize);
+    }
     else {
       if(d->hasID3v1) {
         insert(APETag()->render(), d->ID3v1Location, 0);
@@ -284,8 +258,9 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
       }
     }
   }
-  else if(d->hasAPE && stripOthers)
+  else if(d->hasAPE && stripOthers) {
     success = strip(APE, false) && success;
+  }
 
   return success;
 }
@@ -331,6 +306,10 @@ bool MPEG::File::strip(int tags, bool freeMemory)
     if(ID3v1Tag())
       d->ID3v1Location = findID3v1();
 
+    // Lyrics3v2 tag location has changed, update if it exists
+    
+    findLyrics3v2();
+
     // APE tag location has changed, update if it exists
 
    if(APETag())
@@ -467,6 +446,10 @@ void MPEG::File::read(bool readProperties, Properties::ReadStyle propertiesStyle
     d->tag.set(ID3v1Index, new ID3v1::Tag(this, d->ID3v1Location));
     d->hasID3v1 = true;
   }
+  
+  // Look for a Lyrics3v2 tag
+  
+  findLyrics3v2();
 
   // Look for an APE tag
 
@@ -611,10 +594,41 @@ long MPEG::File::findID3v1()
   return -1;
 }
 
+void MPEG::File::findLyrics3v2()
+{
+  if(isValid()) {
+    long offset = -9;
+    if( d->hasID3v1 )
+      offset -= 128;
+    seek(offset, End);
+
+    if(readBlock(9) == "LYRICS200") {
+      d->hasLyrics3v2 = true;
+      
+      offset -= 6;
+      seek(offset, End);
+      
+      ByteVector sizeVector = readBlock(6);
+      d->lyrics3v2Size = 15 + readNumber(sizeVector);
+      
+      return;
+    }
+  }
+  
+  d->hasLyrics3v2 = false;
+  d->lyrics3v2Size = 0;
+}
+
 void MPEG::File::findAPE()
 {
   if(isValid()) {
-    seek(d->hasID3v1 ? -160 : -32, End);
+    long offset = -32;
+    if(d->hasID3v1)
+      offset -= 128;
+    if(d->hasLyrics3v2)
+      offset -= d->lyrics3v2Size;
+    
+    seek(offset, End);
 
     long p = tell();
 
@@ -632,6 +646,58 @@ void MPEG::File::findAPE()
   d->APEFooterLocation = -1;
 }
 
+long MPEG::File::readNumber(ByteVector vector)
+{
+  long number = 0;
+  int exp = 1;
+  int value = 0;
+  for(int i=vector.size(); i>0; i--) {
+    switch(vector.at(i-1)) {
+      case '1': {
+        value = 1;
+        break;
+      }
+      case '2': {
+        value = 2;
+        break;
+      }
+      case '3': {
+        value = 3;
+        break;
+      }
+      case '4': {
+        value = 4;
+        break;
+      }
+      case '5': {
+        value = 5;
+        break;
+      }
+      case '6': {
+        value = 6;
+        break;
+      }
+      case '7': {
+        value = 7;
+        break;
+      }
+      case '8': {
+        value = 8;
+        break;
+      }
+      case '9': {
+        value = 9;
+        break;
+      }
+      default:
+        value = 0;
+    }
+    number += value * exp;
+    exp *= 10;
+  }
+  return number;
+}
+
 bool MPEG::File::secondSynchByte(char byte)
 {
   if(uchar(byte) == 0xff)

taglib/mpeg/mpegfile.h

@@ -28,7 +28,6 @@
 
 #include "taglib_export.h"
 #include "tfile.h"
-#include "tag.h"
 
 #include "mpegproperties.h"
 
@@ -99,9 +98,6 @@ namespace TagLib {
        * file's audio properties will also be read using \a propertiesStyle.  If
        * false, \a propertiesStyle is ignored.  The frames will be created using
        * \a frameFactory.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
        */
       // BIC: merge with the above constructor
       File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
@@ -132,23 +128,6 @@ namespace TagLib {
        */
       virtual Tag *tag() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * If the file contains more than one tag, only the
-       * first one (in the order ID3v2, APE, ID3v1) will be converted to the
-       * PropertyMap.
-       */
-      PropertyMap properties() const;
-
-      void removeUnsupportedProperties(const StringList &properties);
-
-      /*!
-       * Implements the unified tag dictionary interface -- import function.
-       * As with the export, only one tag is taken into account. If the file
-       * has no tag at all, ID3v2 will be created.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the MPEG::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.
@@ -213,9 +192,9 @@ namespace TagLib {
       /*!
        * Returns a pointer to the ID3v2 tag of the file.
        *
-       * A tag will always be returned, regardless of whether there is a
-       * tag in the file or not. Use ID3v2::Tag::isEmpty() to check if
-       * the tag contains no data.
+       * 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.
        *
        * \note The Tag <b>is still</b> owned by the MPEG::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
@@ -226,9 +205,9 @@ namespace TagLib {
       /*!
        * Returns a pointer to the ID3v1 tag of the file.
        *
-       * A tag will always be returned, regardless of whether there is a
-       * tag in the file or not. Use Tag::isEmpty() to check if
-       * the tag contains no data.
+       * 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 The Tag <b>is still</b> owned by the MPEG::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
@@ -308,8 +287,14 @@ namespace TagLib {
       void read(bool readProperties, Properties::ReadStyle propertiesStyle);
       long findID3v2();
       long findID3v1();
+      void findLyrics3v2();
       void findAPE();
 
+      /*!
+       * Extracts a number from a ByteVector
+       */
+      long readNumber(ByteVector vector);
+
       /*!
        * MPEG frames can be recognized by the bit pattern 11111111 111, so the
        * first byte is easy to check for, however checking to see if the second byte

taglib/mpeg/mpegproperties.cpp

@@ -221,7 +221,7 @@ void MPEG::Properties::read()
       double length = timePerFrame * d->xingHeader->totalFrames();
 
       d->length = int(length);
-      d->bitrate = d->length > 0 ? (int)(d->xingHeader->totalSize() * 8 / length / 1000) : 0;
+      d->bitrate = d->length > 0 ? d->xingHeader->totalSize() * 8 / length / 1000 : 0;
   }
   else {
     // Since there was no valid Xing header found, we hope that we're in a constant

taglib/ogg/flac/oggflacfile.cpp

@@ -263,9 +263,9 @@ void Ogg::FLAC::File::scan()
       d->hasXiphComment = true;
       d->commentPacket = ipacket;
     }
-    else if(blockType > 5) {
+    else if(blockType > 5)
       debug("Ogg::FLAC::File::scan() -- Unknown metadata block");
-    }
+
   }
 
   // End of metadata, now comes the datastream

taglib/ogg/flac/oggflacfile.h

@@ -75,9 +75,6 @@ namespace TagLib {
        * Contructs an Ogg/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.
-       *
-       * \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,
            Properties::ReadStyle propertiesStyle = Properties::Average);

taglib/ogg/oggfile.cpp

@@ -281,8 +281,8 @@ void Ogg::File::writePageGroup(const List<int> &thePageGroup)
     return;
 
 
-  // pages in the pageGroup and packets must be equivalent
-  // (originalSize and size of packets would not work together),
+  // pages in the pageGroup and packets must be equivalent 
+  // (originalSize and size of packets would not work together), 
   // therefore we sometimes have to add pages to the group
   List<int> pageGroup(thePageGroup);
   while (!d->pages[pageGroup.back()]->header()->lastPacketCompleted()) {
@@ -341,7 +341,7 @@ void Ogg::File::writePageGroup(const List<int> &thePageGroup)
 
   if (pages.back()->header()->pageSequenceNumber() != pageGroup.back()) {
 
-    // TODO: change the internal data structure so that we don't need to hold the
+    // TODO: change the internal data structure so that we don't need to hold the 
     // complete file in memory (is unavoidable at the moment)
 
     // read the complete stream

taglib/ogg/oggfile.h

@@ -100,9 +100,6 @@ namespace TagLib {
        * \note This constructor is protected since Ogg::File shouldn't be
        * instantiated directly but rather should be used through the codec
        * specific subclasses.
-       *
-       * \note TagLib will *not* take ownership of the stream, the caller is
-       * responsible for deleting it after the File object.
        */
       File(IOStream *stream);
 

taglib/ogg/oggpage.cpp

@@ -116,9 +116,9 @@ Ogg::Page::ContainsPacketFlags Ogg::Page::containsPacket(int index) const
     flags = ContainsPacketFlags(flags | CompletePacket);
   }
 
-  // Or if there is more than one page and the page is
-  // (a) the first page and it's complete or
-  // (b) the last page and it's complete or
+  // Or if there is more than one page and the page is 
+  // (a) the first page and it's complete or 
+  // (b) the last page and it's complete or 
   // (c) a page in the middle.
   else if(packetCount() > 1 &&
           ((flags & BeginsWithPacket && !d->header.firstPacketContinued()) ||
@@ -266,7 +266,7 @@ List<Ogg::Page *> Ogg::Page::paginate(const ByteVectorList &packets,
       }
 
       Page *p = new Page(packetList, streamSerialNumber, firstPage+pageIndex, continued,
-                         lastPacketInList ? lastPacketCompleted : true,
+                         lastPacketInList ? lastPacketCompleted : true, 
                          isVeryLastPacket);
       pageIndex++;
 

taglib/ogg/oggpage.h

@@ -70,9 +70,9 @@ namespace TagLib {
        */
       const PageHeader *header() const;
 
-      /*!
+      /*! 
        * Returns a copy of the page with \a sequenceNumber set as sequence number.
-       *
+       * 
        * \see header()
        * \see PageHeader::setPageSequenceNumber()
        */

taglib/ogg/speex/speexfile.h

@@ -67,9 +67,6 @@ namespace TagLib {
          * Contructs a Speex 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.
          */
         File(IOStream *stream, bool readProperties = true,
              Properties::ReadStyle propertiesStyle = Properties::Average);

taglib/ogg/vorbis/vorbisfile.cpp

@@ -27,11 +27,9 @@
 
 #include <tstring.h>
 #include <tdebug.h>
-#include <tpropertymap.h>
 
 #include "vorbisfile.h"
 
-
 using namespace TagLib;
 
 class Vorbis::File::FilePrivate
@@ -87,16 +85,6 @@ Ogg::XiphComment *Vorbis::File::tag() const
   return d->comment;
 }
 
-PropertyMap Vorbis::File::properties() const
-{
-  return d->comment->properties();
-}
-
-PropertyMap Vorbis::File::setProperties(const PropertyMap &properties)
-{
-  return d->comment->setProperties(properties);
-}
-
 Vorbis::Properties *Vorbis::File::audioProperties() const
 {
   return d->properties;

taglib/ogg/vorbis/vorbisfile.h

@@ -74,9 +74,6 @@ namespace TagLib {
        * Contructs a Vorbis 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.
        */
       File(IOStream *stream, bool readProperties = true,
            Properties::ReadStyle propertiesStyle = Properties::Average);
@@ -93,19 +90,6 @@ namespace TagLib {
        */
       virtual Ogg::XiphComment *tag() const;
 
-
-      /*!
-       * Implements the unified property interface -- export function.
-       * This forwards directly to XiphComment::properties().
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Implements the unified tag dictionary interface -- import function.
-       * Like properties(), this is a forwarder to the file's XiphComment.
-       */
-      PropertyMap setProperties(const PropertyMap &);
-
       /*!
        * Returns the Vorbis::Properties for this file.  If no audio properties
        * were read then this will return a null pointer.

taglib/ogg/vorbis/vorbisproperties.cpp

@@ -173,7 +173,7 @@ void Vorbis::Properties::read()
     long long end = last->absoluteGranularPosition();
 
     if(start >= 0 && end >= 0 && d->sampleRate > 0)
-      d->length = (int)((end - start) / (long long) d->sampleRate);
+      d->length = (end - start) / (long long) d->sampleRate;
     else
       debug("Vorbis::Properties::read() -- Either the PCM values for the start or "
             "end of this file was incorrect or the sample rate is zero.");

taglib/ogg/xiphcomment.cpp

@@ -27,7 +27,6 @@
 #include <tdebug.h>
 
 #include <xiphcomment.h>
-#include <tpropertymap.h>
 
 using namespace TagLib;
 
@@ -189,58 +188,6 @@ const Ogg::FieldListMap &Ogg::XiphComment::fieldListMap() const
   return d->fieldListMap;
 }
 
-PropertyMap Ogg::XiphComment::properties() const
-{
-  return d->fieldListMap;
-}
-
-PropertyMap Ogg::XiphComment::setProperties(const PropertyMap &properties)
-{
-  // check which keys are to be deleted
-  StringList toRemove;
-  for(FieldListMap::ConstIterator it = d->fieldListMap.begin(); it != d->fieldListMap.end(); ++it)
-    if (!properties.contains(it->first))
-      toRemove.append(it->first);
-
-  for(StringList::ConstIterator it = toRemove.begin(); it != toRemove.end(); ++it)
-      removeField(*it);
-
-  // now go through keys in \a properties and check that the values match those in the xiph comment
-  PropertyMap invalid;
-  PropertyMap::ConstIterator it = properties.begin();
-  for(; it != properties.end(); ++it)
-  {
-    if(!checkKey(it->first))
-      invalid.insert(it->first, it->second);
-    else if(!d->fieldListMap.contains(it->first) || !(it->second == d->fieldListMap[it->first])) {
-      const StringList &sl = it->second;
-      if(sl.size() == 0)
-        // zero size string list -> remove the tag with all values
-        removeField(it->first);
-      else {
-        // replace all strings in the list for the tag
-        StringList::ConstIterator valueIterator = sl.begin();
-        addField(it->first, *valueIterator, true);
-        ++valueIterator;
-        for(; valueIterator != sl.end(); ++valueIterator)
-          addField(it->first, *valueIterator, false);
-      }
-    }
-  }
-  return invalid;
-}
-
-bool Ogg::XiphComment::checkKey(const String &key)
-{
-  if(key.size() < 1)
-    return false;
-  for(String::ConstIterator it = key.begin(); it != key.end(); it++)
-      // forbid non-printable, non-ascii, '=' (#61) and '~' (#126)
-      if (*it < 32 || *it >= 128 || *it == 61 || *it == 126)
-        return false;
-  return true;
-}
-
 String Ogg::XiphComment::vendorID() const
 {
   return d->vendorID;
@@ -340,7 +287,7 @@ void Ogg::XiphComment::parse(const ByteVector &data)
 
   uint pos = 0;
 
-  uint vendorLength = data.mid(0, 4).toUInt(false);
+  int vendorLength = data.mid(0, 4).toUInt(false);
   pos += 4;
 
   d->vendorID = String(data.mid(pos, vendorLength), String::UTF8);

taglib/ogg/xiphcomment.h

@@ -140,29 +140,6 @@ namespace TagLib {
        */
       const FieldListMap &fieldListMap() const;
 
-      /*!
-       * Implements the unified property interface -- export function.
-       * The result is a one-to-one match of the Xiph comment, since it is
-       * completely compatible with the property interface (in fact, a Xiph
-       * comment is nothing more than a map from tag names to list of values,
-       * as is the dict interface).
-       */
-      PropertyMap properties() const;
-
-      /*!
-       * Implements the unified property interface -- import function.
-       * The tags from the given map will be stored one-to-one in the file,
-       * except for invalid keys (less than one character, non-ASCII, or
-       * containing '=' or '~') in which case the according values will
-       * be contained in the returned PropertyMap.
-       */
-      PropertyMap setProperties(const PropertyMap&);
-
-      /*!
-       * Check if the given String is a valid Xiph comment key.
-       */
-      static bool checkKey(const String&);
-
       /*!
        * Returns the vendor ID of the Ogg Vorbis encoder.  libvorbis 1.0 as the
        * most common case always returns "Xiph.Org libVorbis I 20020717".

taglib/riff/aiff/aifffile.cpp

@@ -26,8 +26,6 @@
 #include <tbytevector.h>
 #include <tdebug.h>
 #include <id3v2tag.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
 
 #include "aifffile.h"
 
@@ -85,17 +83,6 @@ ID3v2::Tag *RIFF::AIFF::File::tag() const
   return d->tag;
 }
 
-PropertyMap RIFF::AIFF::File::properties() const
-{
-  return d->tag->properties();
-}
-
-PropertyMap RIFF::AIFF::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag->setProperties(properties);
-}
-
-
 RIFF::AIFF::Properties *RIFF::AIFF::File::audioProperties() const
 {
   return d->properties;
@@ -108,11 +95,6 @@ bool RIFF::AIFF::File::save()
     return false;
   }
 
-  if(!isValid()) {
-    debug("RIFF::AIFF::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
   setChunkData(d->tagChunkID, d->tag->render());
 
   return true;

taglib/riff/aiff/aifffile.h

@@ -69,9 +69,6 @@ namespace TagLib {
          * Contructs an AIFF 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.
          */
         File(IOStream *stream, bool readProperties = true,
              Properties::ReadStyle propertiesStyle = Properties::Average);
@@ -86,18 +83,6 @@ namespace TagLib {
          */
         virtual ID3v2::Tag *tag() const;
 
-        /*!
-         * Implements the unified property interface -- export function.
-         * This method forwards to ID3v2::Tag::properties().
-         */
-        PropertyMap properties() const;
-
-        /*!
-         * Implements the unified property interface -- import function.
-         * This method forwards to ID3v2::Tag::setProperties().
-         */
-        PropertyMap setProperties(const PropertyMap &);
-
         /*!
          * Returns the AIFF::Properties for this file.  If no audio properties
          * were read then this will return a null pointer.

taglib/riff/aiff/aiffproperties.cpp

@@ -139,7 +139,7 @@ int RIFF::AIFF::Properties::sampleWidth() const
   return d->sampleWidth;
 }
 
-TagLib::uint RIFF::AIFF::Properties::sampleFrames() const
+uint RIFF::AIFF::Properties::sampleFrames() const
 {
   return d->sampleFrames;
 }
@@ -154,7 +154,7 @@ void RIFF::AIFF::Properties::read(const ByteVector &data)
   d->sampleFrames   = data.mid(2, 4).toUInt();
   d->sampleWidth    = data.mid(6, 2).toShort();
   double sampleRate = ConvertFromIeeeExtended(reinterpret_cast<unsigned char *>(data.mid(8, 10).data()));
-  d->sampleRate     = (int)sampleRate;
-  d->bitrate        = (int)((sampleRate * d->sampleWidth * d->channels) / 1000.0);
-  d->length         = d->sampleRate > 0 ? d->sampleFrames / d->sampleRate : 0;
+  d->sampleRate     = sampleRate;
+  d->bitrate        = (sampleRate * d->sampleWidth * d->channels) / 1000.0;
+  d->length         = d->sampleFrames / d->sampleRate;
 }

taglib/riff/rifffile.cpp

@@ -189,7 +189,7 @@ void RIFF::File::setChunkData(const ByteVector &name, const ByteVector &data)
     d->chunks[i].padding = 1;
     offset++;
   }
-
+  
   Chunk chunk;
   chunk.name = name;
   chunk.size = data.size();
@@ -203,19 +203,6 @@ void RIFF::File::setChunkData(const ByteVector &name, const ByteVector &data)
 // private members
 ////////////////////////////////////////////////////////////////////////////////
 
-static bool isValidChunkID(const ByteVector &name)
-{
-  if(name.size() != 4) {
-    return false;
-  }
-  for(int i = 0; i < 4; i++) {
-    if(name[i] < 32 || name[i] > 127) {
-      return false;
-    }
-  }
-  return true;
-}
-
 void RIFF::File::read()
 {
   bool bigEndian = (d->endianness == BigEndian);
@@ -229,15 +216,8 @@ void RIFF::File::read()
     ByteVector chunkName = readBlock(4);
     uint chunkSize = readBlock(4).toUInt(bigEndian);
 
-    if(!isValidChunkID(chunkName)) {
-      debug("RIFF::File::read() -- Chunk '" + chunkName + "' has invalid ID");
-      setValid(false);
-      break;
-    }
-
     if(tell() + chunkSize > uint(length())) {
-      debug("RIFF::File::read() -- Chunk '" + chunkName + "' has invalid size (larger than the file size)");
-      setValid(false);
+      // something wrong
       break;
     }
 

taglib/riff/wav/wavfile.cpp

@@ -26,8 +26,6 @@
 #include <tbytevector.h>
 #include <tdebug.h>
 #include <id3v2tag.h>
-#include <tstringlist.h>
-#include <tpropertymap.h>
 
 #include "wavfile.h"
 
@@ -85,17 +83,6 @@ ID3v2::Tag *RIFF::WAV::File::tag() const
   return d->tag;
 }
 
-PropertyMap RIFF::WAV::File::properties() const
-{
-  return d->tag->properties();
-}
-
-PropertyMap RIFF::WAV::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag->setProperties(properties);
-}
-
-
 RIFF::WAV::Properties *RIFF::WAV::File::audioProperties() const
 {
   return d->properties;
@@ -108,11 +95,6 @@ bool RIFF::WAV::File::save()
     return false;
   }
 
-  if(!isValid()) {
-    debug("RIFF::WAV::File::save() -- Trying to save invalid file.");
-    return false;
-  }
-
   setChunkData(d->tagChunkID, d->tag->render());
 
   return true;

taglib/riff/wav/wavfile.h

@@ -69,9 +69,6 @@ namespace TagLib {
          * Contructs an WAV 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.
          */
         File(IOStream *stream, bool readProperties = true,
              Properties::ReadStyle propertiesStyle = Properties::Average);
@@ -86,18 +83,6 @@ namespace TagLib {
          */
         virtual ID3v2::Tag *tag() const;
 
-        /*!
-         * Implements the unified property interface -- export function.
-         * This method forwards to ID3v2::Tag::properties().
-         */
-        PropertyMap properties() const;
-
-        /*!
-         * Implements the unified property interface -- import function.
-         * This method forwards to ID3v2::Tag::setProperties().
-         */
-        PropertyMap setProperties(const PropertyMap &);
-
         /*!
          * Returns the WAV::Properties for this file.  If no audio properties
          * were read then this will return a null pointer.

taglib/riff/wav/wavproperties.cpp

@@ -104,7 +104,7 @@ int RIFF::WAV::Properties::sampleWidth() const
   return d->sampleWidth;
 }
 
-TagLib::uint RIFF::WAV::Properties::sampleFrames() const
+uint RIFF::WAV::Properties::sampleFrames() const
 {
   return d->sampleFrames;
 }
@@ -124,6 +124,5 @@ void RIFF::WAV::Properties::read(const ByteVector &data)
   d->bitrate = byteRate * 8 / 1000;
 
   d->length = byteRate > 0 ? d->streamLength / byteRate : 0;
-  if(d->channels > 0 && d->sampleWidth > 0)
-    d->sampleFrames = d->streamLength / (d->channels * ((d->sampleWidth + 7) / 8));
+  d->sampleFrames = d->streamLength / (d->channels * (d->sampleWidth / 8));
 }

taglib/s3m/s3mfile.cpp

@@ -23,7 +23,6 @@
 #include "tstringlist.h"
 #include "tdebug.h"
 #include "modfileprivate.h"
-#include "tpropertymap.h"
 
 #include <iostream>
 
@@ -68,16 +67,6 @@ Mod::Tag *S3M::File::tag() const
   return &d->tag;
 }
 
-PropertyMap S3M::File::properties() const
-{
-  return d->tag.properties();
-}
-
-PropertyMap S3M::File::setProperties(const PropertyMap &properties)
-{
-  return d->tag.setProperties(properties);
-}
-
 S3M::Properties *S3M::File::audioProperties() const
 {
   return &d->properties;
@@ -118,7 +107,7 @@ bool S3M::File::save()
   }
 
   seek(channels, Current);
-
+  
   StringList lines = d->tag.comment().split("\n");
   // write comment as sample names:
   for(ushort i = 0; i < sampleCount; ++ i) {
@@ -189,13 +178,13 @@ void S3M::File::read(bool)
     if(setting != 0xff) ++ channels;
   }
   d->properties.setChannels(channels);
-
+  
   seek(96);
   ushort realLength = 0;
   for(ushort i = 0; i < length; ++ i) {
-    READ_BYTE_AS(order);
-    if(order == 255) break;
-    if(order != 254) ++ realLength;
+	  READ_BYTE_AS(order);
+	  if(order == 255) break;
+	  if(order != 254) ++ realLength;
   }
   d->properties.setLengthInPatterns(realLength);