Changelog

Use the default frame factory when it's necessary to parse ID3v2 tags in APE files
https://bugs.kde.org/show_bug.cgi?id=278773
2026-06-07 14:59:24 -04:00 · 2012-07-11 12:31:00 +02:00 · 2012-07-11 12:29:14 +02:00
447 changed files with 8198 additions and 33489 deletions
--- a/.astylerc
+++ b/.astylerc
@@ -1,18 +0,0 @@
--suffix=none
--style=kr
--indent=spaces=2
--indent-col1-comments
--min-conditional-indent=0
--attach-extern-c
--attach-namespaces
--indent-namespaces
--pad-oper
--unpad-paren
--align-pointer=name
--align-reference=name
--max-instatement-indent=40
--break-closing-brackets
--remove-brackets
--convert-tabs
--max-code-length=100
--break-after-logical
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,21 +0,0 @@
-# EditorConfig is awesome: http://EditorConfig.org
-
-# top-most EditorConfig file
-root = true
-
-# Non-specified newlines with a newline ending every file
-[*]
-insert_final_newline = true
-
-# 2 space indentation
-[*.{h,cpp,tcc,cmake,yml}]
-indent_style = space
-indent_size = 2
-
-# Trim traling whitespaces
-[*.{h,cpp,tcc,cmake,yml}]
-trim_trailing_whitespace = true
-
-# UTF-8 without BOM
-[*]
-charset = utf-8
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +0,0 @@
-cmake_install.cmake
-cmake_uninstall.cmake
-Makefile
-CTestTestfile.cmake
-CMakeFiles/
-*.so
-*.so.*
-*.dylib
-*.vcproj
-*.ncb
-*.sln
-*.suo
-*.user
-.*
-*~
-/CMakeCache.txt
-/Doxyfile
-/config.h
-/taglib.pc
-/tests/test_runner
-/tests/Testing
-/taglib/libtag.a
-/taglib_config.h
-/taglib-config
-/bindings/c/libtag_c.a
-/bindings/c/taglib_c.pc
-/bindings/c/Debug
-/bindings/c/MinSizeRel
-/bindings/c/Release
-/bindings/c/tag_c.dir/Debug
-/bindings/c/tag_c.dir/MinSizeRel
-/bindings/c/tag_c.dir/Release
-/examples/framelist
-/examples/strip-id3v1
-/examples/tagreader
-/examples/tagreader_c
-/examples/tagwriter
-/doc/html
-/taglib/Debug
-/taglib/MinSizeRel
-/taglib/Release
-/taglib/tag.dir/Debug
-/taglib/tag.dir/MinSizeRel
-/taglib/tag.dir/Release
-/ALL_BUILD.dir
-/ZERO_CHECK.dir
-taglib.h.stamp
-taglib.xcodeproj
-CMakeScripts
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,32 +0,0 @@
-language: cpp
-
-sudo: false
-
-os:
-  - linux
-  - osx
-
-dist: trusty
-
-compiler:
-  - gcc
-  - clang
-
-arch:
-  - ppc64le
-
-addons:
-  apt:
-    packages:
-      - libcppunit-dev
-      - zlib1g-dev
-
-matrix:
-  exclude:
-    - os: osx
-      compiler: gcc
-
-install:
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cppunit; fi
-
-script: cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_BINDINGS=ON -DCMAKE_CXX_FLAGS="-std=c++11" . && make && make check
--- a/3rdparty/utf8-cpp/checked.h
+++ b/3rdparty/utf8-cpp/checked.h
@@ -1,327 +0,0 @@
-// Copyright 2006-2016 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "core.h"
-#include <stdexcept>
-
-namespace utf8
-{
-    // Base for the exceptions that may be thrown from the library
-    class exception : public ::std::exception {
-    };
-
-    // Exceptions that may be thrown from the library functions.
-    class invalid_code_point : public exception {
-        uint32_t cp;
-    public:
-        invalid_code_point(uint32_t codepoint) : cp(codepoint) {}
-        virtual const char* what() const throw() { return "Invalid code point"; }
-        uint32_t code_point() const {return cp;}
-    };
-
-    class invalid_utf8 : public exception {
-        uint8_t u8;
-    public:
-        invalid_utf8 (uint8_t u) : u8(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-8"; }
-        uint8_t utf8_octet() const {return u8;}
-    };
-
-    class invalid_utf16 : public exception {
-        uint16_t u16;
-    public:
-        invalid_utf16 (uint16_t u) : u16(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-16"; }
-        uint16_t utf16_word() const {return u16;}
-    };
-
-    class not_enough_room : public exception {
-    public:
-        virtual const char* what() const throw() { return "Not enough space"; }
-    };
-
-    /// The library API - functions intended to be called by the users
-
-    template <typename octet_iterator>
-    octet_iterator append(uint32_t cp, octet_iterator result)
-    {
-        if (!utf8::internal::is_code_point_valid(cp))
-            throw invalid_code_point(cp);
-
-        if (cp < 0x80)                        // one octet
-            *(result++) = static_cast<uint8_t>(cp);
-        else if (cp < 0x800) {                // two octets
-            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else if (cp < 0x10000) {              // three octets
-            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else {                                // four octets
-            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
-            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        return result;
-    }
-
-    template <typename octet_iterator, typename output_iterator>
-    output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
-    {
-        while (start != end) {
-            octet_iterator sequence_start = start;
-            internal::utf_error err_code = utf8::internal::validate_next(start, end);
-            switch (err_code) {
-                case internal::UTF8_OK :
-                    for (octet_iterator it = sequence_start; it != start; ++it)
-                        *out++ = *it;
-                    break;
-                case internal::NOT_ENOUGH_ROOM:
-                    throw not_enough_room();
-                case internal::INVALID_LEAD:
-                    out = utf8::append (replacement, out);
-                    ++start;
-                    break;
-                case internal::INCOMPLETE_SEQUENCE:
-                case internal::OVERLONG_SEQUENCE:
-                case internal::INVALID_CODE_POINT:
-                    out = utf8::append (replacement, out);
-                    ++start;
-                    // just one replacement mark for the sequence
-                    while (start != end && utf8::internal::is_trail(*start))
-                        ++start;
-                    break;
-            }
-        }
-        return out;
-    }
-
-    template <typename octet_iterator, typename output_iterator>
-    inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
-    {
-        static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
-        return utf8::replace_invalid(start, end, out, replacement_marker);
-    }
-
-    template <typename octet_iterator>
-    uint32_t next(octet_iterator& it, octet_iterator end)
-    {
-        uint32_t cp = 0;
-        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
-        switch (err_code) {
-            case internal::UTF8_OK :
-                break;
-            case internal::NOT_ENOUGH_ROOM :
-                throw not_enough_room();
-            case internal::INVALID_LEAD :
-            case internal::INCOMPLETE_SEQUENCE :
-            case internal::OVERLONG_SEQUENCE :
-                throw invalid_utf8(*it);
-            case internal::INVALID_CODE_POINT :
-                throw invalid_code_point(cp);
-        }
-        return cp;
-    }
-
-    template <typename octet_iterator>
-    uint32_t peek_next(octet_iterator it, octet_iterator end)
-    {
-        return utf8::next(it, end);
-    }
-
-    template <typename octet_iterator>
-    uint32_t prior(octet_iterator& it, octet_iterator start)
-    {
-        // can't do much if it == start
-        if (it == start)
-            throw not_enough_room();
-
-        octet_iterator end = it;
-        // Go back until we hit either a lead octet or start
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        return utf8::peek_next(it, end);
-    }
-
-    /// Deprecated in versions that include "prior"
-    template <typename octet_iterator>
-    uint32_t previous(octet_iterator& it, octet_iterator pass_start)
-    {
-        octet_iterator end = it;
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == pass_start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        octet_iterator temp = it;
-        return utf8::next(temp, end);
-    }
-
-    template <typename octet_iterator, typename distance_type>
-    void advance (octet_iterator& it, distance_type n, octet_iterator end)
-    {
-        for (distance_type i = 0; i < n; ++i)
-            utf8::next(it, end);
-    }
-
-    template <typename octet_iterator>
-    typename std::iterator_traits<octet_iterator>::difference_type
-    distance (octet_iterator first, octet_iterator last)
-    {
-        typename std::iterator_traits<octet_iterator>::difference_type dist;
-        for (dist = 0; first < last; ++dist)
-            utf8::next(first, last);
-        return dist;
-    }
-
-    template <typename u16bit_iterator, typename octet_iterator>
-    octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-    {
-        while (start != end) {
-            uint32_t cp = utf8::internal::mask16(*start++);
-            // Take care of surrogate pairs first
-            if (utf8::internal::is_lead_surrogate(cp)) {
-                if (start != end) {
-                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
-                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
-                        cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
-                    else
-                        throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
-                }
-                else
-                    throw invalid_utf16(static_cast<uint16_t>(cp));
-
-            }
-            // Lone trail surrogate
-            else if (utf8::internal::is_trail_surrogate(cp))
-                throw invalid_utf16(static_cast<uint16_t>(cp));
-
-            result = utf8::append(cp, result);
-        }
-        return result;
-    }
-
-    template <typename u16bit_iterator, typename octet_iterator>
-    u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
-    {
-        while (start < end) {
-            uint32_t cp = utf8::next(start, end);
-            if (cp > 0xffff) { //make a surrogate pair
-                *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
-                *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
-            }
-            else
-                *result++ = static_cast<uint16_t>(cp);
-        }
-        return result;
-    }
-
-    template <typename octet_iterator, typename u32bit_iterator>
-    octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
-    {
-        while (start != end)
-            result = utf8::append(*(start++), result);
-
-        return result;
-    }
-
-    template <typename octet_iterator, typename u32bit_iterator>
-    u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
-    {
-        while (start < end)
-            (*result++) = utf8::next(start, end);
-
-        return result;
-    }
-
-    // The iterator class
-    template <typename octet_iterator>
-    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
-      octet_iterator it;
-      octet_iterator range_start;
-      octet_iterator range_end;
-      public:
-      iterator () {}
-      explicit iterator (const octet_iterator& octet_it,
-                         const octet_iterator& rangestart,
-                         const octet_iterator& rangeend) :
-               it(octet_it), range_start(rangestart), range_end(rangeend)
-      {
-          if (it < range_start || it > range_end)
-              throw std::out_of_range("Invalid utf-8 iterator position");
-      }
-      // the default "big three" are OK
-      octet_iterator base () const { return it; }
-      uint32_t operator * () const
-      {
-          octet_iterator temp = it;
-          return utf8::next(temp, range_end);
-      }
-      bool operator == (const iterator& rhs) const
-      {
-          if (range_start != rhs.range_start || range_end != rhs.range_end)
-              throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
-          return (it == rhs.it);
-      }
-      bool operator != (const iterator& rhs) const
-      {
-          return !(operator == (rhs));
-      }
-      iterator& operator ++ ()
-      {
-          utf8::next(it, range_end);
-          return *this;
-      }
-      iterator operator ++ (int)
-      {
-          iterator temp = *this;
-          utf8::next(it, range_end);
-          return temp;
-      }
-      iterator& operator -- ()
-      {
-          utf8::prior(it, range_start);
-          return *this;
-      }
-      iterator operator -- (int)
-      {
-          iterator temp = *this;
-          utf8::prior(it, range_start);
-          return temp;
-      }
-    }; // class iterator
-
-} // namespace utf8
-
-#endif //header guard
-
-
--- a/3rdparty/utf8-cpp/core.h
+++ b/3rdparty/utf8-cpp/core.h
@@ -1,332 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include <iterator>
-
-namespace utf8
-{
-    // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
-    // You may need to change them to match your system.
-    // These typedefs have the same names as ones from cstdint, or boost/cstdint
-    typedef unsigned char   uint8_t;
-    typedef unsigned short  uint16_t;
-    typedef unsigned int    uint32_t;
-
-// Helper code - not intended to be directly called by the library users. May be changed at any time
-namespace internal
-{
-    // Unicode constants
-    // Leading (high) surrogates: 0xd800 - 0xdbff
-    // Trailing (low) surrogates: 0xdc00 - 0xdfff
-    const uint16_t LEAD_SURROGATE_MIN  = 0xd800u;
-    const uint16_t LEAD_SURROGATE_MAX  = 0xdbffu;
-    const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
-    const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
-    const uint16_t LEAD_OFFSET         = LEAD_SURROGATE_MIN - (0x10000 >> 10);
-    const uint32_t SURROGATE_OFFSET    = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
-
-    // Maximum valid value for a Unicode code point
-    const uint32_t CODE_POINT_MAX      = 0x0010ffffu;
-
-    template<typename octet_type>
-    inline uint8_t mask8(octet_type oc)
-    {
-        return static_cast<uint8_t>(0xff & oc);
-    }
-    template<typename u16_type>
-    inline uint16_t mask16(u16_type oc)
-    {
-        return static_cast<uint16_t>(0xffff & oc);
-    }
-    template<typename octet_type>
-    inline bool is_trail(octet_type oc)
-    {
-        return ((utf8::internal::mask8(oc) >> 6) == 0x2);
-    }
-
-    template <typename u16>
-    inline bool is_lead_surrogate(u16 cp)
-    {
-        return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
-    }
-
-    template <typename u16>
-    inline bool is_trail_surrogate(u16 cp)
-    {
-        return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
-    }
-
-    template <typename u16>
-    inline bool is_surrogate(u16 cp)
-    {
-        return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
-    }
-
-    template <typename u32>
-    inline bool is_code_point_valid(u32 cp)
-    {
-        return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
-    }
-
-    template <typename octet_iterator>
-    inline typename std::iterator_traits<octet_iterator>::difference_type
-    sequence_length(octet_iterator lead_it)
-    {
-        uint8_t lead = utf8::internal::mask8(*lead_it);
-        if (lead < 0x80)
-            return 1;
-        else if ((lead >> 5) == 0x6)
-            return 2;
-        else if ((lead >> 4) == 0xe)
-            return 3;
-        else if ((lead >> 3) == 0x1e)
-            return 4;
-        else
-            return 0;
-    }
-
-    template <typename octet_difference_type>
-    inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
-    {
-        if (cp < 0x80) {
-            if (length != 1) 
-                return true;
-        }
-        else if (cp < 0x800) {
-            if (length != 2) 
-                return true;
-        }
-        else if (cp < 0x10000) {
-            if (length != 3) 
-                return true;
-        }
-
-        return false;
-    }
-
-    enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
-
-    /// Helper for get_sequence_x
-    template <typename octet_iterator>
-    utf_error increase_safely(octet_iterator& it, octet_iterator end)
-    {
-        if (++it == end)
-            return NOT_ENOUGH_ROOM;
-
-        if (!utf8::internal::is_trail(*it))
-            return INCOMPLETE_SEQUENCE;
-        
-        return UTF8_OK;
-    }
-
-    #define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}    
-
-    /// get_sequence_x functions decode utf-8 sequences of the length x
-    template <typename octet_iterator>
-    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-            return NOT_ENOUGH_ROOM;
-
-        code_point = utf8::internal::mask8(*it);
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end) 
-            return NOT_ENOUGH_ROOM;
-        
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-            return NOT_ENOUGH_ROOM;
-            
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (*it) & 0x3f;
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-           return NOT_ENOUGH_ROOM;
-
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (utf8::internal::mask8(*it) << 6) & 0xfff;
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (*it) & 0x3f;
-
-        return UTF8_OK;
-    }
-
-    #undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
-
-    template <typename octet_iterator>
-    utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-	if (it == end)
-            return NOT_ENOUGH_ROOM;
-
-        // Save the original value of it so we can go back in case of failure
-        // Of course, it does not make much sense with i.e. stream iterators
-        octet_iterator original_it = it;
-
-        uint32_t cp = 0;
-        // Determine the sequence length based on the lead octet
-        typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
-        const octet_difference_type length = utf8::internal::sequence_length(it);
-
-        // Get trail octets and calculate the code point
-        utf_error err = UTF8_OK;
-        switch (length) {
-            case 0: 
-                return INVALID_LEAD;
-            case 1:
-                err = utf8::internal::get_sequence_1(it, end, cp);
-                break;
-            case 2:
-                err = utf8::internal::get_sequence_2(it, end, cp);
-            break;
-            case 3:
-                err = utf8::internal::get_sequence_3(it, end, cp);
-            break;
-            case 4:
-                err = utf8::internal::get_sequence_4(it, end, cp);
-            break;
-        }
-
-        if (err == UTF8_OK) {
-            // Decoding succeeded. Now, security checks...
-            if (utf8::internal::is_code_point_valid(cp)) {
-                if (!utf8::internal::is_overlong_sequence(cp, length)){
-                    // Passed! Return here.
-                    code_point = cp;
-                    ++it;
-                    return UTF8_OK;
-                }
-                else
-                    err = OVERLONG_SEQUENCE;
-            }
-            else 
-                err = INVALID_CODE_POINT;
-        }
-
-        // Failure branch - restore the original value of the iterator
-        it = original_it;
-        return err;
-    }
-
-    template <typename octet_iterator>
-    inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
-        uint32_t ignored;
-        return utf8::internal::validate_next(it, end, ignored);
-    }
-
-} // namespace internal
-
-    /// The library API - functions intended to be called by the users
-
-    // Byte order mark
-    const uint8_t bom[] = {0xef, 0xbb, 0xbf};
-
-    template <typename octet_iterator>
-    octet_iterator find_invalid(octet_iterator start, octet_iterator end)
-    {
-        octet_iterator result = start;
-        while (result != end) {
-            utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
-            if (err_code != internal::UTF8_OK)
-                return result;
-        }
-        return result;
-    }
-
-    template <typename octet_iterator>
-    inline bool is_valid(octet_iterator start, octet_iterator end)
-    {
-        return (utf8::find_invalid(start, end) == end);
-    }
-
-    template <typename octet_iterator>
-    inline bool starts_with_bom (octet_iterator it, octet_iterator end)
-    {
-        return (
-            ((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
-            ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
-            ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
-           );
-    }
-	
-    //Deprecated in release 2.3 
-    template <typename octet_iterator>
-    inline bool is_bom (octet_iterator it)
-    {
-        return (
-            (utf8::internal::mask8(*it++)) == bom[0] &&
-            (utf8::internal::mask8(*it++)) == bom[1] &&
-            (utf8::internal::mask8(*it))   == bom[2]
-           );
-    }
-} // namespace utf8
-
-#endif // header guard
-
-
--- a/12
+++ b/12
@@ -1,23 +1,11 @@
 Scott Wheeler <wheeler@kde.org>
 Author, maintainer
-Lukas Lalinsky <lalinsky@gmail.com>
- Implementation of multiple new file formats, many bug fixes, maintainer
-Tsuda Kageyu <tsuda.kageyu@gmail.com>
- A lot of bug fixes and performance improvements, maintainer.
-Stephen F. Booth <me@sbooth.org>
- DSF metadata implementation, bug fixes, maintainer.
 Ismael Orenstein <orenstein@kde.org>
 Xing header implementation
 Allan Sandfeld Jensen <kde@carewolf.org>
 FLAC metadata implementation
 Teemu Tervo <teemu.tervo@gmx.net>
 Numerous bug reports and fixes
-Mathias Panzenböck <grosser.meister.morti@gmx.net>
- Mod, S3M, IT and XM metadata implementations
-Damien Plisson <damien78@audirvana.com>
- DSDIFF metadata implementation
-Urs Fleisch <ufleisch@users.sourceforge.net>
- Bug fixes, maintainer.

 Please send all patches and questions to taglib-devel@kde.org rather than to
 individual developers!
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,168 +1,82 @@
-cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)
-
 project(taglib)

-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)

-if(DEFINED ENABLE_STATIC)
-  message(FATAL_ERROR "This option is no longer available, use BUILD_SHARED_LIBS instead")
-endif()
+OPTION(ENABLE_STATIC "Make static version of libtag"  OFF)

-option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-if(APPLE)
-  option(BUILD_FRAMEWORK "Build an OS X framework" OFF)
-  if(BUILD_FRAMEWORK)
-    set(BUILD_SHARED_LIBS ON)
-    #set(CMAKE_MACOSX_RPATH 1)
-    set(FRAMEWORK_INSTALL_DIR "/Library/Frameworks" CACHE STRING "Directory to install frameworks to.")
-  endif()
-endif()
-if(NOT BUILD_SHARED_LIBS)
-  add_definitions(-DTAGLIB_STATIC)
-endif()
-option(ENABLE_STATIC_RUNTIME "Visual Studio, link with runtime statically" OFF)
+OPTION(BUILD_TESTS "Build the test suite"  OFF)
+OPTION(BUILD_EXAMPLES "Build the examples"  OFF)

-option(ENABLE_CCACHE "Use ccache when building libtag" OFF)
-if(ENABLE_CCACHE)
-  find_program(CCACHE_FOUND ccache)
-  if(CCACHE_FOUND)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-    set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-  endif()
-endif()
-
-option(VISIBILITY_HIDDEN "Build with -fvisibility=hidden" OFF)
-option(BUILD_TESTS "Build the test suite" OFF)
-option(BUILD_EXAMPLES "Build the examples" OFF)
-option(BUILD_BINDINGS "Build the bindings" ON)
-
-option(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs" OFF)
-
-option(PLATFORM_WINRT "Enable WinRT support" OFF)
-if(PLATFORM_WINRT)
-  add_definitions(-DPLATFORM_WINRT)
-endif()
+OPTION(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
+OPTION(WITH_ASF "Enable ASF tag reading/writing code"  OFF)
+OPTION(WITH_MP4 "Enable MP4 tag reading/writing code"  OFF)

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

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

-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
-endif()
+if (CMAKE_COMPILER_IS_GNUCXX)
+   if (CMAKE_SYSTEM_NAME MATCHES Linux)
+     set ( CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} -Wno-long-long -ansi -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+     set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -fno-check-new -fno-common")
+   endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+endif (CMAKE_COMPILER_IS_GNUCXX)
+if(MSVC)
+  if (MSVC_VERSION GREATER 1399)
+    # If using Visual C++ 2005 (MSVC80) and greater (MSVC_VERSION=1400)
+    add_definitions(/D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /Zc:wchar_t-)
+  endif (MSVC_VERSION GREATER 1399)
+endif(MSVC)
+if (WIN32)
+  set(CMAKE_DEBUG_POSTFIX "d")
+endif (WIN32)

-if(MSVC AND ENABLE_STATIC_RUNTIME)
-  foreach(flag_var CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-    string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
-  endforeach(flag_var)
-endif()
+SET(TAGLIB_LIB_MAJOR_VERSION "1")
+SET(TAGLIB_LIB_MINOR_VERSION "7")
+SET(TAGLIB_LIB_PATCH_VERSION "2")

-# Read version information from file taglib/toolkit/taglib.h into variables
-# TAGLIB_LIB_MAJOR_VERSION, TAGLIB_LIB_MINOR_VERSION, TAGLIB_LIB_PATCH_VERSION.
-foreach(version_part MAJOR MINOR PATCH)
-  set(version_var_name "TAGLIB_${version_part}_VERSION")
-  file(STRINGS taglib/toolkit/taglib.h version_line
-       REGEX "^#define +${version_var_name}")
-  if(NOT version_line)
-    message(FATAL_ERROR "${version_var_name} not found in taglib.h")
-  endif()
-  string(REGEX MATCH "${version_var_name} +([^ ]+)" result ${version_line})
-  set(TAGLIB_LIB_${version_part}_VERSION ${CMAKE_MATCH_1})
-endforeach(version_part)
+SET(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")

-# Only used to force cmake rerun when taglib.h changes.
-configure_file(taglib/toolkit/taglib.h ${CMAKE_CURRENT_BINARY_DIR}/taglib.h.stamp)
-
-if("${TAGLIB_LIB_PATCH_VERSION}" EQUAL "0")
-  set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}")
-else()
-  set(TAGLIB_LIB_VERSION_STRING "${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}")
-endif()
-
-# 1. If the library source code has changed at all since the last update, then increment revision.
-# 2. If any interfaces have been added, removed, or changed since the last update, increment current, and set revision to 0.
-# 3. If any interfaces have been added since the last public release, then increment age.
-# 4. If any interfaces have been removed since the last public release, then set age to 0.
-set(TAGLIB_SOVERSION_CURRENT  19)
-set(TAGLIB_SOVERSION_REVISION 0)
-set(TAGLIB_SOVERSION_AGE      18)
-
-math(EXPR TAGLIB_SOVERSION_MAJOR "${TAGLIB_SOVERSION_CURRENT} - ${TAGLIB_SOVERSION_AGE}")
-math(EXPR TAGLIB_SOVERSION_MINOR "${TAGLIB_SOVERSION_AGE}")
-math(EXPR TAGLIB_SOVERSION_PATCH "${TAGLIB_SOVERSION_REVISION}")

 include(ConfigureChecks.cmake)

-if(${ZLIB_FOUND})
-  set(ZLIB_LIBRARIES_FLAGS -lz)
-endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib-config )

 if(NOT WIN32)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" @ONLY)
-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config" DESTINATION "${BIN_INSTALL_DIR}")
-endif()
-
-if(WIN32)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib-config.cmd.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd")
-  install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/taglib-config.cmd" DESTINATION "${BIN_INSTALL_DIR}")
-endif()
-
-if(NOT BUILD_FRAMEWORK)
-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" @ONLY)
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/taglib.pc" DESTINATION "${LIB_INSTALL_DIR}/pkgconfig")
-endif()
-
-if(NOT HAVE_ZLIB AND ZLIB_SOURCE)
-  set(HAVE_ZLIB 1)
-  set(HAVE_ZLIB_SOURCE 1)
-endif()
-
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/taglib.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc )
+endif(NOT WIN32)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
+configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )

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

-option(TRACE_IN_RELEASE "Output debug messages even in release mode" OFF)
-if(TRACE_IN_RELEASE)
-  set(TRACE_IN_RELEASE TRUE)
-endif()
+ADD_SUBDIRECTORY( taglib ) 

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

-add_subdirectory(taglib)
+ADD_SUBDIRECTORY(bindings)
+if(NOT WIN32)
+  install( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+endif(NOT WIN32)

-if(BUILD_BINDINGS)
-  add_subdirectory(bindings)
-endif()
+INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})

-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-  enable_testing()
-  add_subdirectory(tests)
-endif()
-
-if(BUILD_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake" "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 file(COPY doc/taglib.png DESTINATION doc)
-add_custom_target(docs doxygen)
+ADD_CUSTOM_TARGET(docs doxygen)

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

-# Check if the size of numeric types are suitable.
+#check for libz using the cmake supplied FindZLIB.cmake
+FIND_PACKAGE(ZLIB)

-check_type_size("short" SIZEOF_SHORT)
-if(NOT ${SIZEOF_SHORT} EQUAL 2)
-  message(FATAL_ERROR "TagLib requires that short is 16-bit wide.")
-endif()
+IF(ZLIB_FOUND)
+	SET(HAVE_ZLIB 1)
+ELSE(ZLIB_FOUND)
+	SET(HAVE_ZLIB 0)
+ENDIF(ZLIB_FOUND)

-check_type_size("int" SIZEOF_INT)
-if(NOT ${SIZEOF_INT} EQUAL 4)
-  message(FATAL_ERROR "TagLib requires that int is 32-bit wide.")
-endif()
-
-check_type_size("long long" SIZEOF_LONGLONG)
-if(NOT ${SIZEOF_LONGLONG} EQUAL 8)
-  message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.")
-endif()
-
-check_type_size("wchar_t" SIZEOF_WCHAR_T)
-if(${SIZEOF_WCHAR_T} LESS 2)
-  message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.")
-endif()
-
-check_type_size("float" SIZEOF_FLOAT)
-if(NOT ${SIZEOF_FLOAT} EQUAL 4)
-  message(FATAL_ERROR "TagLib requires that float is 32-bit wide.")
-endif()
-
-check_type_size("double" SIZEOF_DOUBLE)
-if(NOT ${SIZEOF_DOUBLE} EQUAL 8)
-  message(FATAL_ERROR "TagLib requires that double is 64-bit wide.")
-endif()
-
-# Determine which kind of atomic operations your compiler supports.
-
-check_cxx_source_compiles("
-    int main() {
-      volatile int x;
-      __sync_add_and_fetch(&x, 1);
-      int y = __sync_sub_and_fetch(&x, 1);
-      return 0;
-    }
-  " HAVE_GCC_ATOMIC)
-
-if(NOT HAVE_GCC_ATOMIC)
-  check_cxx_source_compiles("
-      #include <libkern/OSAtomic.h>
-      int main() {
-        volatile int32_t x;
-        OSAtomicIncrement32Barrier(&x);
-        int32_t y = OSAtomicDecrement32Barrier(&x);
-        return 0;
-      }
-    " HAVE_MAC_ATOMIC)
-
-  if(NOT HAVE_MAC_ATOMIC)
-    check_cxx_source_compiles("
-        #include <windows.h>
-        int main() {
-          volatile LONG x;
-          InterlockedIncrement(&x);
-          LONG y = InterlockedDecrement(&x);
-          return 0;
-        }
-      " HAVE_WIN_ATOMIC)
-
-    if(NOT HAVE_WIN_ATOMIC)
-      check_cxx_source_compiles("
-          #include <ia64intrin.h>
-          int main() {
-            volatile int x;
-            __sync_add_and_fetch(&x, 1);
-            int y = __sync_sub_and_fetch(&x, 1);
-            return 0;
-          }
-        " HAVE_IA64_ATOMIC)
-    endif()
-  endif()
-endif()
-
-# Determine which kind of byte swap functions your compiler supports.
-
-check_cxx_source_compiles("
-  int main() {
-    __builtin_bswap16(0);
-    __builtin_bswap32(0);
-    __builtin_bswap64(0);
-    return 0;
-  }
-" HAVE_GCC_BYTESWAP)
-
-if(NOT HAVE_GCC_BYTESWAP)
-  check_cxx_source_compiles("
-    #include <byteswap.h>
-    int main() {
-      __bswap_16(0);
-      __bswap_32(0);
-      __bswap_64(0);
-      return 0;
-    }
-  " HAVE_GLIBC_BYTESWAP)
-
-  if(NOT HAVE_GLIBC_BYTESWAP)
-    check_cxx_source_compiles("
-      #include <stdlib.h>
-      int main() {
-        _byteswap_ushort(0);
-        _byteswap_ulong(0);
-        _byteswap_uint64(0);
-        return 0;
-      }
-    " HAVE_MSC_BYTESWAP)
-
-    if(NOT HAVE_MSC_BYTESWAP)
-      check_cxx_source_compiles("
-        #include <libkern/OSByteOrder.h>
-        int main() {
-          OSSwapInt16(0);
-          OSSwapInt32(0);
-          OSSwapInt64(0);
-          return 0;
-        }
-      " HAVE_MAC_BYTESWAP)
-
-      if(NOT HAVE_MAC_BYTESWAP)
-        check_cxx_source_compiles("
-          #include <sys/endian.h>
-          int main() {
-            swap16(0);
-            swap32(0);
-            swap64(0);
-            return 0;
-          }
-        " HAVE_OPENBSD_BYTESWAP)
-      endif()
-    endif()
-  endif()
-endif()
-
-# Determine whether your compiler supports some safer version of vsprintf.
-
-check_cxx_source_compiles("
-  #include <cstdio>
-  #include <cstdarg>
-  int main() {
-    char buf[20];
-    va_list args;
-    vsnprintf(buf, 20, \"%d\", args);
-    return 0;
-  }
-" HAVE_VSNPRINTF)
-
-if(NOT HAVE_VSNPRINTF)
-  check_cxx_source_compiles("
-    #include <cstdio>
-    #include <cstdarg>
-    int main() {
-      char buf[20];
-      va_list args;
-      vsprintf_s(buf, \"%d\", args);
-      return 0;
-    }
-  " HAVE_VSPRINTF_S)
-endif()
-
-# Determine whether your compiler supports ISO _strdup.
-
-check_cxx_source_compiles("
-  #include <cstring>
-  int main() {
-    _strdup(0);
-    return 0;
-  }
-" HAVE_ISO_STRDUP)
-
-# Determine whether zlib is installed.
-
-if(NOT ZLIB_SOURCE)
-  find_package(ZLIB)
-  if(ZLIB_FOUND)
-    set(HAVE_ZLIB 1)
-  else()
-    set(HAVE_ZLIB 0)
-  endif()
-endif()
-
-# Determine whether CppUnit is installed.
-
-if(BUILD_TESTS AND NOT BUILD_SHARED_LIBS)
-  find_package(CppUnit)
-  if(NOT CppUnit_FOUND)
-    message(STATUS "CppUnit not found, disabling tests.")
-    set(BUILD_TESTS OFF)
-  endif()
-endif()
-
-# Detect WinRT mode
-if(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-	set(PLATFORM WINRT 1)
-endif()
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+FIND_PACKAGE(CppUnit)
+IF (NOT CppUnit_FOUND AND BUILD_TESTS)
+	MESSAGE(STATUS "CppUnit not found, disabling tests.")
+	SET(BUILD_TESTS OFF)
+ENDIF(NOT CppUnit_FOUND AND BUILD_TESTS)
--- a/25
+++ b/25
@@ -0,0 +1,25 @@
+TagLib Installation
+===================
+
+TagLib uses the CMake build system. As a user, you will most likely want to
+build TagLib in release mode and install it into a system-wide location.
+This can be done using the following commands:
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_RELEASE_TYPE=Release .
+  make
+  sudo make install
+
+Some file formats in TagLib are not enabled by default, you can compile
+support for MP4 and WMA using the following options:
+
+  cmake -DWITH_MP4=ON -DWITH_ASF=ON [...]
+
+If you want to run the test suite to make sure TagLib works properly on your
+system, you need to have cppunit installed. The test suite has a custom target
+in the build system, so you can run the tests using make:
+
+  make check
+
+See http://www.cmake.org/cmake/help/runningcmake.html for generic help on
+running CMake.
+
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -1,219 +0,0 @@
-TagLib Installation
-===================
-
-TagLib uses the CMake build system. As a user, you will most likely want to
-build TagLib in release mode and install it into a system-wide location.
-This can be done using the following commands:
-
-    cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release .
-    make
-    sudo make install
-
-In order to build the included examples, use the `BUILD_EXAMPLES` option:
-
-    cmake -DBUILD_EXAMPLES=ON [...]
-
-See http://www.cmake.org/cmake/help/runningcmake.html for generic help on
-running CMake.
-
-Mac OS X
--------
-
-On Mac OS X, you might want to build a framework that can be easily integrated
-into your application. If you set the BUILD_FRAMEWORK option on, it will compile
-TagLib as a framework. For example, the following command can be used to build
-an Universal Binary framework with Mac OS X 10.4 as the deployment target:
-
-    cmake -DCMAKE_BUILD_TYPE=Release \
-      -DBUILD_FRAMEWORK=ON \
-      -DCMAKE_C_COMPILER=/usr/bin/gcc-4.0 \
-      -DCMAKE_CXX_COMPILER=/usr/bin/c++-4.0 \
-      -DCMAKE_OSX_SYSROOT=/Developer/SDKs/MacOSX10.4u.sdk/ \
-      -DCMAKE_OSX_DEPLOYMENT_TARGET=10.4 \
-      -DCMAKE_OSX_ARCHITECTURES="ppc;i386;x86_64"
-
-For a 10.6 Snow Leopard static library with both 32-bit and 64-bit code, use:
-
-    cmake -DCMAKE_BUILD_TYPE=Release \
-      -DCMAKE_OSX_DEPLOYMENT_TARGET=10.6 \
-      -DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
-      -DBUILD_SHARED_LIBS=OFF \
-      -DCMAKE_INSTALL_PREFIX="<folder you want to install to>"
-
-After `make`, and `make install`, add `libtag.` to your XCode project, and add
-the include folder to the project's User Header Search Paths.
-
-Windows
-------
-
-It's Windows ... Systems vary!
-This means you need to adjust things to suit your system, especially paths.
-
-Tested with:
-* Microsoft Visual Studio 2010, 2015, 2017
-* Microsoft C++ Build Tools 2015, 2017 (standalone packages not requiring Visual Studio)
-* GCC by mingw-w64.sf.net v4.6.3 (Strawberry Perl 32b)
-* MinGW32-4.8.0
-
-Requirements:
-* Tool chain, build environment, whatever ya want to call it ...
-     Installed and working.
-* CMake program. (Available at: www.cmake.org)
-     Installed and working.
-
-Optional:
-*  Zlib library.
-     Available in some tool chains, not all.
-     Search the web, take your choice.
-
-Useful configuration options used with CMake (GUI and/or command line):
-  Any of the `ZLIB_` variables may be used at the command line, `ZLIB_ROOT` is only
-  available on the command line.
-
-  | option                  | description |
-  | ----------------------- | ----------- |
-  | `ZLIB_ROOT=`            | Where to find ZLib's root directory. Assumes parent of: `\include` and `\lib.`|
-  | `ZLIB_INCLUDE_DIR=`     | Where to find ZLib's Include directory.|
-  | `ZLIB_LIBRARY=`         | Where to find ZLib's Library.
-  | `ZLIB_SOURCE=`          | Where to find ZLib's Source Code. Alternative to `ZLIB_INCLUDE_DIR` and `ZLIB_LIBRARY`.
-  | `CMAKE_INSTALL_PREFIX=` | Where to install Taglib. |
-  | `CMAKE_BUILD_TYPE=`     | Release, Debug, etc ... (Not available in MSVC) |
-
-The easiest way is at the command prompt (Visual C++ command prompt for MSVS users – batch file and/or shortcuts are your friends).
-
-1.  **Build the Makefiles:**
-
-    Replace "GENERATOR" with your needs.
-    * For MSVS: `Visual Studio XX YYYY`, e.g. `Visual Studio 14 2015`.
-
-      **Note**: As Visual Studio 2017 supports CMake, you can skip this step and open the taglib
-      folder in VS instead.
-    * For MinGW: `MinGW Makefiles`
-
-          C:\GitRoot\taglib> cmake -G "GENERATOR"  -DCMAKE_INSTALL_PREFIX=C:\Libraries\taglib
-
-    Or use the CMake GUI:
-    1. Open CMake GUI.
-    2. Set paths: *Where is the source code* and *Where to build the binaries*.
-
-       In the example, both would be: `C:\GitRoot\taglib`
-    3. Tick: Advanced
-    4. Select: Configure
-    5. Select: Generator
-    6. Tick: Use default native compilers
-    7. Select: Finish
-      Wait until done.
-    8. If using ZLib, Scroll down.
-    (to the bottom of the list of options ... should go over them all)
-       1. Edit: `ZLIB_INCLUDE_DIR`
-       2. Edit: `ZLIB_LIBRARY`
-    9. Select: Generate
-
-2.  **Build the project**
-    * MSVS:
-
-          C:\GitRoot\taglib> msbuild all_build.vcxproj /p:Configuration=Release
-      OR (Depending on MSVS version or personal choice)
-
-          C:\GitRoot\taglib> devenv all_build.vcxproj /build Release
-      OR in the MSVS GUI:
-      1. Open MSVS.
-      2. Open taglib solution.
-      3. Set build type to: Release (look in the tool bars)
-      2. Hit F7 to build the solution. (project)
-    * MinGW:
-
-          C:\GitRoot\taglib> gmake
-
-      OR (Depending on MinGW install)
-
-          C:\GitRoot\taglib> mingw32-make
-
-
-
-3.  **Install the project**
-
-    (Change `install` to `uninstall` to uninstall the project)
-    * MSVS:
-
-          C:\GitRoot\taglib> msbuild install.vcxproj
-      OR (Depending on MSVC version or personal choice)
-
-          C:\GitRoot\taglib> devenv install.vcxproj
-
-      Or in the MSVS GUI:
-        1. Open project.
-        2. Open Solution Explorer.
-        3. Right Click: INSTALL
-        4. Select: Project Only
-        5. Select: Build Only INSTALL
-    * MinGW:
-
-          C:\GitRoot\taglib> gmake install
-      OR (Depending on MinGW install)
-
-          C:\GitRoot\taglib> mingw32-make install
-
-
-To build a static library, set the following two options with CMake:
-
-    -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON
-
-Including `ENABLE_STATIC_RUNTIME=ON` indicates you want TagLib built using the
-static runtime library, rather than the DLL form of the runtime.
-
-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 -DBUILD_SHARED_LIBS=OFF` when running cmake.
-
-The test suite has a custom target in the build system, so you can run
-the tests using make:
-
-    make check
-
-Windows MinGW:
-
-* Get cppunit from https://www.freedesktop.org/wiki/Software/cppunit/
-* Build it for MinGW:
-  - `./autogen.sh`
-  - `./configure --disable-shared`
-  - `mingw32-make; mingw32-make install DESTDIR=/path/to/install/dir`
-* Build TagLib with testing enabled:
-  - ```
-    cmake -G "MinGW Makefiles" -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=OFF \
-    -DCPPUNIT_INCLUDE_DIR=/path/to/cppunit/include \
-    -DCPPUNIT_LIBRARIES=/path/to/cppunit/lib/libcppunit.a \
-    -DCPPUNIT_INSTALLED_VERSION=1.15.1
-    ```
-  - `mingw32-make`
-  - `mingw32-make check`
-
-Windows MSVS:
-
-* Get cppunit from https://www.freedesktop.org/wiki/Software/cppunit/
-* Build it in Visual Studio:
-  - Open examples/examples2008.sln, convert all, do not overwrite.
-  - Set architecture to x64, build configuration, e.g. Debug DLL.
-  - It may fail, but the needed libraries should be available in src\cppunit\DebugDll.
-* Build TagLib with testing enabled:
-  - ```
-    cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON
-    -DBUILD_SHARED_LIBS=OFF -DENABLE_STATIC_RUNTIME=ON
-    -DCPPUNIT_INCLUDE_DIR=\path\to\cppunit\include
-    -DCPPUNIT_LIBRARIES=\path\to\cppunit\DebugDll\cppunitd_dll.lib
-    -DCPPUNIT_INSTALLED_VERSION=1.15.1
-    ```
-  - `msbuild all_build.vcxproj /p:Configuration=Debug`
-  - `path %path%;\path\to\cppunit\DebugDll`
-  - `tests\Debug\test_runner.exe`
-
-macOS:
-
-* Install cppunit using a package manager, e.g. `brew install cppunit`
-* Build TagLib with testing enabled:
-  - `cmake -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON -DBUILD_SHARED_LIBS=OFF`
-  - `make`
-  - `make check`
--- a/218
+++ b/218
@@ -1,213 +1,7 @@
-TagLib 1.12 (Feb 16, 2021)
-==========================
+TagLib 1.7.3 (Jul 12, 2012)
+===========================

- * Added support for WinRT.
- * Added support for Linux on POWER.
- * Added support for classical music tags of iTunes 12.5.
- * Added support for file descriptor to FileStream.
- * Added support for 'cmID', 'purl', 'egid' MP4 atoms.
- * Added support for 'GRP1' ID3v2 frame.
- * Added support for extensible WAV subformat.
- * Enabled FileRef to detect file types based on the stream content.
- * Dropped support for Windows 9x and NT 4.0 or older.
- * Check for mandatory header objects in ASF files.
- * More tolerant handling of RIFF padding, WAV files, broken MPEG streams.
- * Improved calculation of Ogg, Opus, Speex, WAV, MP4 bitrates.
- * Improved Windows compatibility by storing FLAC picture after comments.
- * Fixed numerical genres in ID3v2.3.0 'TCON' frames.
- * Fixed consistency of API removing MP4 items when empty values are set.
- * Fixed consistency of API preferring COMM frames with no description.
- * Fixed OOB read on invalid Ogg FLAC files (CVE-2018-11439).
- * Fixed handling of empty MPEG files.
- * Fixed parsing MP4 mdhd timescale.
- * Fixed reading MP4 atoms with zero length.
- * Fixed reading FLAC files with zero-sized seektables.
- * Fixed handling of lowercase field names in Vorbis Comments.
- * Fixed handling of 'rate' atoms in MP4 files.
- * Fixed handling of invalid UTF-8 sequences.
- * Fixed possible file corruptions when saving Ogg files.
- * Fixed handling of non-audio blocks, sampling rates, DSD audio in WavPack files.
- * TableOfContentsFrame::toString() improved.
- * UserTextIdentificationFrame::toString() improved.
- * Marked FileRef::create() deprecated.
- * Marked MPEG::File::save() with boolean parameters deprecated,
-   provide overloads with enum parameters.
- * Several smaller bug fixes and performance improvements.
-
-TagLib 1.11.1 (Oct 24, 2016)
-============================
-
- * Fixed binary incompatible change in TagLib::String.
- * Fixed reading ID3v2 CTOC frames with a lot of entries.
- * Fixed seeking ByteVectorStream from the end.
-
-TagLib 1.11 (Apr 29, 2016)
-==========================
-
-1.11:
-
- * Fixed reading APE items with long keys.
- * Fixed reading ID3v2 SYLT frames when description is empty.
-
-1.11 BETA 2:
-
- * Better handling of PCM WAV files with a 'fact' chunk.
- * Better handling of corrupted APE tags.
- * Efficient decoding of unsynchronized ID3v2 frames.
- * Fixed text encoding when saving certain frames in ID3v2.3 tags.
- * Fixed updating the size of RIFF files when removing chunks.
- * Several smaller bug fixes and performance improvements.
-
-1.11 BETA:
-
- * New API for creating FileRef from IOStream.
- * Added support for ID3v2 PCST and WFED frames.
- * Added support for pictures in XiphComment.
- * Added String::clear().
- * Added FLAC::File::strip() for removing non-standard tags.
- * Added alternative functions to XiphComment::removeField().
- * Added BUILD_BINDINGS build option.
- * Added ENABLE_CCACHE build option.
- * Replaced ENABLE_STATIC build option with BUILD_SHARED_LIBS.
- * Better handling of duplicate ID3v2 tags in all kinds of files.
- * Better handling of duplicate tag chunks in WAV files.
- * Better handling of duplicate tag chunks in AIFF files.
- * Better handling of duplicate Vorbis comment blocks in FLAC files.
- * Better handling of broken MPEG audio frames.
- * Fixed crash when calling File::properties() after strip().
- * Fixed crash when parsing certain MPEG files.
- * Fixed crash when saving Ogg files.
- * Fixed possible file corruptions when saving ASF files.
- * Fixed possible file corruptions when saving FLAC files.
- * Fixed possible file corruptions when saving MP4 files.
- * Fixed possible file corruptions when saving MPEG files.
- * Fixed possible file corruptions when saving APE files.
- * Fixed possible file corruptions when saving Musepack files.
- * Fixed possible file corruptions when saving WavPack files.
- * Fixed updating the comment field of Vorbis comments.
- * Fixed reading date and time in ID3v2.3 tags.
- * Marked ByteVector::null and ByteVector::isNull() deprecated.
- * Marked String::null and String::isNull() deprecated.
- * Marked XiphComment::removeField() deprecated.
- * Marked Ogg::Page::getCopyWithNewPageSequenceNumber() deprecated. It returns null.
- * Marked custom integer types deprecated.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.10 (Nov 11, 2015)
-==========================
-
-1.10:
-
- * Added new options to the tagwriter example.
- * Fixed self-assignment operator in some types.
- * Fixed extraction of MP4 tag keys with an empty list.
-
-1.10 BETA:
-
- * New API for the audio length in milliseconds.
- * Added support for ID3v2 ETCO and SYLT frames.
- * Added support for album artist in PropertyMap API of MP4 files.
- * Added support for embedded frames in ID3v2 CHAP and CTOC frames.
- * Added support for AIFF-C files.
- * Better handling of duplicate ID3v2 tags in MPEG files.
- * Allowed generating taglib.pc on Windows.
- * Added ZLIB_SOURCE build option.
- * Fixed backwards-incompatible change in TagLib::String when constructing UTF16 strings.
- * Fixed crash when parsing certain FLAC files.
- * Fixed crash when encoding empty strings.
- * Fixed saving of certain XM files on OS X.
- * Changed Xiph and APE generic getters to return space-concatenated values.
- * Fixed possible file corruptions when removing tags from WAV files.
- * Added support for MP4 files with 64-bit atoms in certain 64-bit environments.
- * Prevented ID3v2 padding from being too large.
- * Fixed crash when parsing corrupted APE files.
- * Fixed crash when parsing corrupted WAV files.
- * Fixed crash when parsing corrupted Ogg FLAC files.
- * Fixed crash when parsing corrupted MPEG files.
- * Fixed saving empty tags in WAV files.
- * Fixed crash when parsing corrupted Musepack files.
- * Fixed possible memory leaks when parsing AIFF and WAV files.
- * Fixed crash when parsing corrupted MP4 files.
- * Stopped writing empty ID3v2 frames.
- * Fixed possible file corruptions when saving WMA files.
- * Added TagLib::MP4::Tag::isEmpty().
- * Added accessors to manipulate MP4 tags.
- * Fixed crash when parsing corrupted WavPack files.
- * Fixed seeking MPEG frames.
- * Fixed reading FLAC files with zero-sized padding blocks.
- * Added support for reading the encoder information of WMA files.
- * Added support for reading the codec of WAV files.
- * Added support for multi channel WavPack files.
- * Added support for reading the nominal bitrate of Ogg Speex files.
- * Added support for VBR headers in MPEG files.
- * Marked FLAC::File::streamInfoData() deprecated. It returns an empty ByteVector.
- * Marked FLAC::File::streamLength() deprecated. It returns zero.
- * Fixed possible file corruptions when adding an ID3v1 tag to FLAC files.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.9.1 (Oct 8, 2013)
-==========================
-
- * Fixed binary incompatible change in TagLib::Map and TagLib::List.
- * Fixed constructing String from ByteVector.
- * Fixed compilation on MSVC with the /Zc:wchar_t- option.
- * Fixed detecting of RIFF files with invalid chunk sizes.
- * Added TagLib::MP4::Properties::codec().
-
-TagLib 1.9 (Oct 6, 2013)
-========================
-
- * Added support for the Ogg Opus file format.
- * Added support for INFO tags in WAV files.
- * Changed FileStream to use Windows file API.
- * Included taglib-config.cmd script for Windows.
- * New ID3v1::Tag methods for working directly with genre numbers.
- * New MPEG::File methods for checking which tags are saved in the file.
- * Added support for the PropertyMap API to ASF and MP4 files.
- * Added MusicBrainz identifiers to the PropertyMap API.
- * Allowed reading of MP4 cover art without an explicitly specified format.
- * Better parsing of corrupted FLAC files.
- * Fixed saving of PropertyMap comments without description into ID3v2 tags.
- * Fixed crash when parsing certain XM files.
- * Fixed compilation of unit test with clang.
- * Better handling of files that can't be open or have read-only permissions.
- * Improved atomic reference counting.
- * New hookable API for debug messages.
- * More complete Windows install instructions.
- * Many smaller bug fixes and performance improvements.
-
-TagLib 1.8 (Sep 6, 2012)
-========================
-
-1.8:
-
- * Added support for OWNE ID3 frames.
- * Changed key validation in the new PropertyMap API.
- * ID3v1::Tag::setStringHandler will no londer delete the previous handler,
-   the caller is responsible for this.
- * File objects will also no longer delete the passed IOStream objects. It
-   should be done in the caller code after the File object is no longer
-   used.
- * Added ID3v2::Tag::setLatin1StringHandler for custom handling of
-   latin1-encoded text in ID3v2 frames.
- * Fixed validation of ID3v2 frame IDs (IDs with '0' were ignored).
-
-1.8 BETA:
-
- * New API for accessing tags by name.
- * New abstract I/O stream layer to allow custom I/O handlers.
- * Support for writing ID3v2.3 tags.
- * Support for various module file formats (MOD, S3M, IT, XM).
- * Support for MP4 and ASF is now enabled by default.
- * Started using atomic int operations for reference counting.
- * Added methods for checking if WMA and MP4 files are DRM-protected.
- * Added taglib_free to the C bindings.
- * New method to allow removing pictures from FLAC files.
- * Support for reading audio properties from ALAC and Musepack SV8 files.
- * Added replay-gain information to Musepack audio properties.
- * Support for APEv2 binary tags.
- * Many AudioProperties subclasses now provide information about the total number of samples.
- * Various small bug fixes.
+ * Fixed crash when parsing ID3v2 tags from APE files (BUG:278773).

 TagLib 1.7.2 (Apr 20, 2012)
 ===========================
@@ -258,7 +52,7 @@ TagLib 1.6.3 (Apr 17, 2010)
 * Fixed definitions of the TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF macros.
 * Fixed upgrading of ID3v2.3 genre frame with ID3v1 code 0 (Blues).
 * New method `int String::toInt(bool *ok)` which can return whether the
-   conversion to a number was successful.
+   conversion to a number was successfull.
 * Fixed parsing of incorrectly written lengths in ID3v2 (affects mainly
   compressed frames). (BUG:231075)

@@ -266,7 +60,7 @@ TagLib 1.6.2 (Apr 9, 2010)
 ==========================

 * Read Vorbis Comments from the first FLAC metadata block, if there are
-   multiple ones. (BUG:211089)
+   multipe ones. (BUG:211089)
 * Fixed a memory leak in FileRef's OGA format detection.
 * Fixed compilation with the Sun Studio compiler. (BUG:215225)
 * Handle WM/TrackNumber attributes with DWORD content in WMA files.
@@ -301,7 +95,7 @@ TagLib 1.6 (Sep 13, 2009)
 * Added support for disabling dllimport/dllexport on Windows using the
   TAGLIB_STATIC macro.
 * Support for parsing the obsolete 'gnre' MP4 atom.
- * New cpp macros TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF to determine if
+ * New cpp macros TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF to determin if
   TagLib was built with MP4/ASF support.

 1.6 RC1:
--- a/README.md
+++ b/README.md
@@ -1,26 +0,0 @@
-# TagLib
-
-[![Build Status](https://travis-ci.org/taglib/taglib.svg?branch=master)](https://travis-ci.org/taglib/taglib)
-
-### TagLib Audio Metadata Library
-
-https://taglib.org/
-
-TagLib is a library for reading and editing the metadata of several
-popular audio formats. Currently it supports both ID3v1 and [ID3v2][]
-for MP3 files, [Ogg Vorbis][] comments and ID3 tags
-in [FLAC][], MPC, Speex, WavPack, TrueAudio, WAV, AIFF, MP4, APE,
-and ASF files.
-
-TagLib is distributed under the [GNU Lesser General Public License][]
-(LGPL) and [Mozilla Public License][] (MPL). Essentially that means that
-it may be used in proprietary applications, but if changes are made to
-TagLib they must be contributed back to the project. Please review the
-licenses if you are considering using TagLib in your project.
-
-  [ID3v2]: https://id3.org/
-  [Ogg Vorbis]: https://xiph.org/vorbis/
-  [FLAC]: https://xiph.org/flac/
-  [GNU Lesser General Public License]: https://www.gnu.org/licenses/lgpl.html
-  [Mozilla Public License]: https://www.mozilla.org/MPL/MPL-1.1.html
-
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -1 +1 @@
-add_subdirectory(c) 
+ADD_SUBDIRECTORY( c ) 
--- a/bindings/README
+++ b/bindings/README
@@ -2,5 +2,5 @@ There are a few other people that have done bindings externally that I have
 been made aware of.  I have not personally reviewed these bindings, but I'm
 listing them here so that those who find them useful are able to find them:

-http://developer.kde.org/~wheeler/taglib.html#bindings
-
+- Ruby - http://www.hakubi.us/ruby-taglib/
+- Python - http://namingmuse.berlios.de/
--- a/bindings/c/CMakeLists.txt
+++ b/bindings/c/CMakeLists.txt
@@ -1,44 +1,37 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/asf
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/vorbis
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpc
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mp4
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2/frames
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/trueaudio
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/toolkit
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/asf
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/vorbis
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/flac
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/flac
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpc
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mp4
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/mpeg/id3v2/frames
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/wavpack
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/ogg/speex
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../../taglib/trueaudio
 )

-set(tag_c_HDRS tag_c.h)

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

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

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

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

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

+########### install files ###############
+
+INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib_c.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+INSTALL( FILES  tag_c.h DESTINATION ${INCLUDE_INSTALL_DIR}/taglib)
--- a/bindings/c/tag_c.cpp
+++ b/bindings/c/tag_c.cpp
@@ -20,9 +20,11 @@
 ***************************************************************************/

 #ifdef HAVE_CONFIG_H
-# include <config.h>
+#include "config.h"
 #endif

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

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

-namespace
-{
-  List<char *> strings;
-  bool unicodeStrings = true;
-  bool stringManagementEnabled = true;
-
-  char *stringToCharArray(const String &s)
-  {
-    const std::string str = s.to8Bit(unicodeStrings);
-
-#ifdef HAVE_ISO_STRDUP
-
-    return ::_strdup(str.c_str());
-
-#else
-
-    return ::strdup(str.c_str());
-
-#endif
-  }
-
-  String charArrayToString(const char *s)
-  {
-    return String(s, unicodeStrings ? String::UTF8 : String::Latin1);
-  }
-}
+static List<char *> strings;
+static bool unicodeStrings = true;
+static bool stringManagementEnabled = true;

 void taglib_set_strings_unicode(BOOL unicode)
 {
-  unicodeStrings = (unicode != 0);
+  unicodeStrings = bool(unicode);
 }

 void taglib_set_string_management_enabled(BOOL management)
 {
-  stringManagementEnabled = (management != 0);
-}
-
-void taglib_free(void* pointer)
-{
-  free(pointer);
+  stringManagementEnabled = bool(management);
 }

 ////////////////////////////////////////////////////////////////////////////////
@@ -114,13 +86,19 @@ TagLib_File *taglib_file_new_type(const char *filename, TagLib_File_Type type)
    return reinterpret_cast<TagLib_File *>(new Ogg::Speex::File(filename));
  case TagLib_File_TrueAudio:
    return reinterpret_cast<TagLib_File *>(new TrueAudio::File(filename));
+#ifdef TAGLIB_WITH_MP4
  case TagLib_File_MP4:
    return reinterpret_cast<TagLib_File *>(new MP4::File(filename));
+#endif
+#ifdef TAGLIB_WITH_ASF
  case TagLib_File_ASF:
    return reinterpret_cast<TagLib_File *>(new ASF::File(filename));
+#endif
  default:
    return 0;
  }
+
+  return 0;
 }

 void taglib_file_free(TagLib_File *file)
@@ -130,7 +108,7 @@ void taglib_file_free(TagLib_File *file)

 BOOL taglib_file_is_valid(const TagLib_File *file)
 {
-  return reinterpret_cast<const File *>(file)->isValid();
+	return reinterpret_cast<const File *>(file)->isValid();
 }

 TagLib_Tag *taglib_file_tag(const TagLib_File *file)
@@ -157,7 +135,7 @@ BOOL taglib_file_save(TagLib_File *file)
 char *taglib_tag_title(const TagLib_Tag *tag)
 {
  const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->title());
+  char *s = ::strdup(t->title().toCString(unicodeStrings));
  if(stringManagementEnabled)
    strings.append(s);
  return s;
@@ -166,7 +144,7 @@ char *taglib_tag_title(const TagLib_Tag *tag)
 char *taglib_tag_artist(const TagLib_Tag *tag)
 {
  const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->artist());
+  char *s = ::strdup(t->artist().toCString(unicodeStrings));
  if(stringManagementEnabled)
    strings.append(s);
  return s;
@@ -175,7 +153,7 @@ char *taglib_tag_artist(const TagLib_Tag *tag)
 char *taglib_tag_album(const TagLib_Tag *tag)
 {
  const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->album());
+  char *s = ::strdup(t->album().toCString(unicodeStrings));
  if(stringManagementEnabled)
    strings.append(s);
  return s;
@@ -184,7 +162,7 @@ char *taglib_tag_album(const TagLib_Tag *tag)
 char *taglib_tag_comment(const TagLib_Tag *tag)
 {
  const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->comment());
+  char *s = ::strdup(t->comment().toCString(unicodeStrings));
  if(stringManagementEnabled)
    strings.append(s);
  return s;
@@ -193,7 +171,7 @@ char *taglib_tag_comment(const TagLib_Tag *tag)
 char *taglib_tag_genre(const TagLib_Tag *tag)
 {
  const Tag *t = reinterpret_cast<const Tag *>(tag);
-  char *s = stringToCharArray(t->genre());
+  char *s = ::strdup(t->genre().toCString(unicodeStrings));
  if(stringManagementEnabled)
    strings.append(s);
  return s;
@@ -214,31 +192,31 @@ unsigned int taglib_tag_track(const TagLib_Tag *tag)
 void taglib_tag_set_title(TagLib_Tag *tag, const char *title)
 {
  Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setTitle(charArrayToString(title));
+  t->setTitle(String(title, unicodeStrings ? String::UTF8 : String::Latin1));
 }

 void taglib_tag_set_artist(TagLib_Tag *tag, const char *artist)
 {
  Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setArtist(charArrayToString(artist));
+  t->setArtist(String(artist, unicodeStrings ? String::UTF8 : String::Latin1));
 }

 void taglib_tag_set_album(TagLib_Tag *tag, const char *album)
 {
  Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setAlbum(charArrayToString(album));
+  t->setAlbum(String(album, unicodeStrings ? String::UTF8 : String::Latin1));
 }

 void taglib_tag_set_comment(TagLib_Tag *tag, const char *comment)
 {
  Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setComment(charArrayToString(comment));
+  t->setComment(String(comment, unicodeStrings ? String::UTF8 : String::Latin1));
 }

 void taglib_tag_set_genre(TagLib_Tag *tag, const char *genre)
 {
  Tag *t = reinterpret_cast<Tag *>(tag);
-  t->setGenre(charArrayToString(genre));
+  t->setGenre(String(genre, unicodeStrings ? String::UTF8 : String::Latin1));
 }

 void taglib_tag_set_year(TagLib_Tag *tag, unsigned int year)
@@ -258,7 +236,7 @@ void taglib_tag_free_strings()
  if(!stringManagementEnabled)
    return;

-  for(List<char *>::ConstIterator it = strings.begin(); it != strings.end(); ++it)
+  for(List<char *>::Iterator it = strings.begin(); it != strings.end(); ++it)
    free(*it);
  strings.clear();
 }
--- a/bindings/c/tag_c.h
+++ b/bindings/c/tag_c.h
@@ -29,9 +29,7 @@
 extern "C" {
 #endif

-#if defined(TAGLIB_STATIC)
-#define TAGLIB_C_EXPORT
-#elif defined(_WIN32) || defined(_WIN64)
+#if defined(_WIN32) || defined(_WIN64)
 #ifdef MAKE_TAGLIB_C_LIB
 #define TAGLIB_C_EXPORT __declspec(dllexport)
 #else
@@ -81,11 +79,6 @@ TAGLIB_C_EXPORT void taglib_set_strings_unicode(BOOL unicode);
 */
 TAGLIB_C_EXPORT void taglib_set_string_management_enabled(BOOL management);

-/*!
- * Explicitly free a string returned from TagLib
- */
-TAGLIB_C_EXPORT void taglib_free(void* pointer);
-
 /*******************************************************************************
 * File API
 ******************************************************************************/
@@ -106,7 +99,7 @@ typedef enum {
 /*!
 * Creates a TagLib file based on \a filename.  TagLib will try to guess the file
 * type.
- *
+ * 
 * \returns NULL if the file type cannot be determined or the file cannot
 * be opened.
 */
@@ -124,7 +117,7 @@ TAGLIB_C_EXPORT TagLib_File *taglib_file_new_type(const char *filename, TagLib_F
 TAGLIB_C_EXPORT void taglib_file_free(TagLib_File *file);

 /*!
- * Returns true if the file is open and readable and valid information for
+ * Returns true if the file is open and readble and valid information for
 * the Tag and / or AudioProperties was found.
 */

@@ -137,7 +130,7 @@ TAGLIB_C_EXPORT BOOL taglib_file_is_valid(const TagLib_File *file);
 TAGLIB_C_EXPORT TagLib_Tag *taglib_file_tag(const TagLib_File *file);

 /*!
- * Returns a pointer to the audio properties associated with this file.  This
+ * Returns a pointer to the the audio properties associated with this file.  This
 * will be freed automatically when the file is freed.
 */
 TAGLIB_C_EXPORT const TagLib_AudioProperties *taglib_file_audioproperties(const TagLib_File *file);
--- a/bindings/c/taglib_c.pc.cmake
+++ b/bindings/c/taglib_c.pc.cmake
@@ -7,6 +7,6 @@ includedir=${INCLUDE_INSTALL_DIR}
 Name: TagLib C Bindings
 Description: Audio meta-data library (C bindings)
 Requires: taglib
-Version: ${TAGLIB_LIB_VERSION_STRING}
+Version: ${TAGLIB_LIB_MAJOR_VERSION}.${TAGLIB_LIB_MINOR_VERSION}.${TAGLIB_LIB_PATCH_VERSION}
 Libs: -L${LIB_INSTALL_DIR} -ltag_c
 Cflags: -I${INCLUDE_INSTALL_DIR}/taglib 
--- a/cmake_uninstall.cmake.in
+++ b/cmake_uninstall.cmake.in
@@ -1,21 +0,0 @@
-if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-  message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-endif()
-
-file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-string(REGEX REPLACE "\n" ";" files "${files}")
-foreach (file ${files})
-  message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
-  if (EXISTS "$ENV{DESTDIR}${file}")
-    execute_process(
-      COMMAND @CMAKE_COMMAND@ -E remove "$ENV{DESTDIR}${file}"
-      OUTPUT_VARIABLE rm_out
-      RESULT_VARIABLE rm_retval
-    )
-    if(NOT ${rm_retval} EQUAL 0)
-      message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
-    endif ()
-  else ()
-    message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
-  endif ()
-endforeach()
--- a/config-taglib.h.cmake
+++ b/config-taglib.h.cmake
@@ -0,0 +1,11 @@
+/* config-taglib.h. Generated by cmake from config-taglib.h.cmake */
+
+/* NOTE: only add something here if it is really needed by all of kdelibs.
+   Otherwise please prefer adding to the relevant config-foo.h.cmake file,
+   to minimize recompilations and increase modularity. */
+/* Define if you have libz */
+#cmakedefine   HAVE_ZLIB 1
+
+#cmakedefine   NO_ITUNES_HACKS 1
+#cmakedefine   WITH_ASF 1
+#cmakedefine   WITH_MP4 1
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1,34 +0,0 @@
-/* config.h. Generated by cmake from config.h.cmake */
-
-#ifndef TAGLIB_CONFIG_H
-#define TAGLIB_CONFIG_H
-
-/* Defined if your compiler supports some byte swap functions */
-#cmakedefine   HAVE_GCC_BYTESWAP 1
-#cmakedefine   HAVE_GLIBC_BYTESWAP 1
-#cmakedefine   HAVE_MSC_BYTESWAP 1
-#cmakedefine   HAVE_MAC_BYTESWAP 1
-#cmakedefine   HAVE_OPENBSD_BYTESWAP 1
-
-/* Defined if your compiler supports some atomic operations */
-#cmakedefine   HAVE_GCC_ATOMIC 1
-#cmakedefine   HAVE_MAC_ATOMIC 1
-#cmakedefine   HAVE_WIN_ATOMIC 1
-#cmakedefine   HAVE_IA64_ATOMIC 1
-
-/* Defined if your compiler supports some safer version of vsprintf */
-#cmakedefine   HAVE_VSNPRINTF 1
-#cmakedefine   HAVE_VSPRINTF_S 1
-
-/* Defined if your compiler supports ISO _strdup */
-#cmakedefine   HAVE_ISO_STRDUP 1
-
-/* Defined if zlib is installed */
-#cmakedefine   HAVE_ZLIB 1
-
-/* Indicates whether debug messages are shown even in release mode */
-#cmakedefine   TRACE_IN_RELEASE 1
-
-#cmakedefine TESTS_DIR "@TESTS_DIR@"
-
-#endif
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,40 +1,50 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2/frames
-  ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/
-)
+if(BUILD_EXAMPLES)
+INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/ape
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v1
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg/id3v2
+		     ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/c/  )

-if(NOT BUILD_SHARED_LIBS)
-  add_definitions(-DTAGLIB_STATIC)
-endif()
+if(ENABLE_STATIC)
+    add_definitions(-DTAGLIB_STATIC)
+endif(ENABLE_STATIC)

 ########### next target ###############

-add_executable(tagreader tagreader.cpp)
-target_link_libraries(tagreader tag)
+ADD_EXECUTABLE(tagreader tagreader.cpp)
+
+TARGET_LINK_LIBRARIES(tagreader  tag )
+

 ########### next target ###############

-add_executable(tagreader_c tagreader_c.c)
-target_link_libraries(tagreader_c tag_c)
+ADD_EXECUTABLE(tagreader_c tagreader_c.c)
+
+TARGET_LINK_LIBRARIES(tagreader_c  tag_c )
+

 ########### next target ###############

-add_executable(tagwriter tagwriter.cpp)
-target_link_libraries(tagwriter tag)
+ADD_EXECUTABLE(tagwriter tagwriter.cpp)
+
+TARGET_LINK_LIBRARIES(tagwriter  tag )
+

 ########### next target ###############

-add_executable(framelist framelist.cpp)
-target_link_libraries(framelist tag)
+ADD_EXECUTABLE(framelist framelist.cpp)
+
+TARGET_LINK_LIBRARIES(framelist  tag )
+

 ########### next target ###############

-add_executable(strip-id3v1 strip-id3v1.cpp)
-target_link_libraries(strip-id3v1 tag)
+ADD_EXECUTABLE(strip-id3v1 strip-id3v1.cpp)
+
+TARGET_LINK_LIBRARIES(strip-id3v1  tag )
+
+
+endif(BUILD_EXAMPLES)

--- a/examples/framelist.cpp
+++ b/examples/framelist.cpp
@@ -32,7 +32,6 @@
 #include <id3v2tag.h>
 #include <id3v2frame.h>
 #include <id3v2header.h>
-#include <commentsframe.h>

 #include <id3v1tag.h>

@@ -66,15 +65,8 @@ int main(int argc, char *argv[])
           << endl;

      ID3v2::FrameList::ConstIterator it = id3v2tag->frameList().begin();
-      for(; it != id3v2tag->frameList().end(); it++) {
-        cout << (*it)->frameID();
-
-        if(ID3v2::CommentsFrame *comment = dynamic_cast<ID3v2::CommentsFrame *>(*it))
-          if(!comment->description().isEmpty())
-            cout << " [" << comment->description() << "]";
-
-        cout << " - \"" << (*it)->toString() << "\"" << endl;
-      }
+      for(; it != id3v2tag->frameList().end(); it++)
+        cout << (*it)->frameID() << " - \"" << (*it)->toString() << "\"" << endl;
    }
    else
      cout << "file does not have a valid id3v2 tag" << endl;
@@ -103,10 +95,7 @@ int main(int argc, char *argv[])
      for(APE::ItemListMap::ConstIterator it = ape->itemListMap().begin();
          it != ape->itemListMap().end(); ++it)
      {
-        if((*it).second.type() != APE::Item::Binary)
-          cout << (*it).first << " - \"" << (*it).second.toString() << "\"" << endl;
-        else
-          cout << (*it).first << " - Binary data (" << (*it).second.binaryData().size() << " bytes)" << endl;
+        cout << (*it).first << " - \"" << (*it).second.toString() << "\"" << endl;
      }
    }
    else
--- a/examples/tagreader.cpp
+++ b/examples/tagreader.cpp
@@ -23,15 +23,20 @@
 */

 #include <iostream>
-#include <iomanip>
 #include <stdio.h>

 #include <fileref.h>
 #include <tag.h>
-#include <tpropertymap.h>

 using namespace std;

+TagLib::String formatSeconds(int seconds)
+{
+  char secondsString[3];
+  sprintf(secondsString, "%02i", seconds);
+  return secondsString;
+}
+
 int main(int argc, char *argv[])
 {
  for(int i = 1; i < argc; i++) {
@@ -44,7 +49,7 @@ int main(int argc, char *argv[])

      TagLib::Tag *tag = f.tag();

-      cout << "-- TAG (basic) --" << endl;
+      cout << "-- TAG --" << endl;
      cout << "title   - \"" << tag->title()   << "\"" << endl;
      cout << "artist  - \"" << tag->artist()  << "\"" << endl;
      cout << "album   - \"" << tag->album()   << "\"" << endl;
@@ -52,23 +57,6 @@ int main(int argc, char *argv[])
      cout << "comment - \"" << tag->comment() << "\"" << endl;
      cout << "track   - \"" << tag->track()   << "\"" << endl;
      cout << "genre   - \"" << tag->genre()   << "\"" << endl;
-
-      TagLib::PropertyMap tags = f.file()->properties();
-
-      unsigned int longest = 0;
-      for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-        if (i->first.size() > longest) {
-          longest = i->first.size();
-        }
-      }
-
-      cout << "-- TAG (properties) --" << endl;
-      for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-        for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
-          cout << left << std::setw(longest) << i->first << " - " << '"' << *j << '"' << endl;
-        }
-      }
-
    }

    if(!f.isNull() && f.audioProperties()) {
@@ -82,7 +70,7 @@ int main(int argc, char *argv[])
      cout << "bitrate     - " << properties->bitrate() << endl;
      cout << "sample rate - " << properties->sampleRate() << endl;
      cout << "channels    - " << properties->channels() << endl;
-      cout << "length      - " << minutes << ":" << setfill('0') << setw(2) << seconds << endl;
+      cout << "length      - " << minutes << ":" << formatSeconds(seconds) << endl;
    }
  }
  return 0;
--- a/examples/tagwriter.cpp
+++ b/examples/tagwriter.cpp
@@ -23,7 +23,6 @@
 */

 #include <iostream>
-#include <iomanip>
 #include <string.h>

 #include <stdio.h>
@@ -35,7 +34,6 @@
 #include <fileref.h>
 #include <tfile.h>
 #include <tag.h>
-#include <tpropertymap.h>

 using namespace std;

@@ -67,32 +65,11 @@ void usage()
  cout << "  -g <genre>"   << endl;
  cout << "  -y <year>"    << endl;
  cout << "  -T <track>"   << endl;
-  cout << "  -R <tagname> <tagvalue>"   << endl;
-  cout << "  -I <tagname> <tagvalue>"   << endl;
-  cout << "  -D <tagname>"   << endl;
  cout << endl;

  exit(1);
 }

-void checkForRejectedProperties(const TagLib::PropertyMap &tags)
-{ // stolen from tagreader.cpp
-  if(tags.size() > 0) {
-    unsigned int longest = 0;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-      if(i->first.size() > longest) {
-        longest = i->first.size();
-      }
-    }
-    cout << "-- rejected TAGs (properties) --" << endl;
-    for(TagLib::PropertyMap::ConstIterator i = tags.begin(); i != tags.end(); ++i) {
-      for(TagLib::StringList::ConstIterator j = i->second.begin(); j != i->second.end(); ++j) {
-        cout << left << std::setw(longest) << i->first << " - " << '"' << *j << '"' << endl;
-      }
-    }
-  }
-}
-
 int main(int argc, char *argv[])
 {
  TagLib::List<TagLib::FileRef> fileList;
@@ -117,7 +94,7 @@ int main(int argc, char *argv[])
      char field = argv[i][1];
      TagLib::String value = argv[i + 1];

-      TagLib::List<TagLib::FileRef>::ConstIterator it;
+      TagLib::List<TagLib::FileRef>::Iterator it;
      for(it = fileList.begin(); it != fileList.end(); ++it) {

        TagLib::Tag *t = (*it).tag();
@@ -144,29 +121,6 @@ int main(int argc, char *argv[])
        case 'T':
          t->setTrack(value.toInt());
          break;
-        case 'R':
-        case 'I':
-          if(i + 2 < argc) {
-            TagLib::PropertyMap map = (*it).file()->properties ();
-            if(field == 'R') {
-              map.replace(value, TagLib::String(argv[i + 2]));
-            }
-            else {
-              map.insert(value, TagLib::String(argv[i + 2]));
-            }
-            ++i;
-            checkForRejectedProperties((*it).file()->setProperties(map));
-          }
-          else {
-            usage();
-          }
-          break;
-        case 'D': {
-          TagLib::PropertyMap map = (*it).file()->properties();
-          map.erase(value);
-          checkForRejectedProperties((*it).file()->setProperties(map));
-          break;
-        }
        default:
          usage();
          break;
@@ -177,7 +131,7 @@ int main(int argc, char *argv[])
      usage();
  }

-  TagLib::List<TagLib::FileRef>::ConstIterator it;
+  TagLib::List<TagLib::FileRef>::Iterator it;
  for(it = fileList.begin(); it != fileList.end(); ++it)
    (*it).file()->save();

--- a/include/README
+++ b/include/README
@@ -0,0 +1,16 @@
+These are only necessary at build-time when building the entire kdesupport module; they do not need to be installed on a running system.
+
+It can be regenerated by using something like the following from the taglib/taglib directory:
+
+for file in `find -type f -name "*\.h"`;
+do 
+  dir=`dirname $file`
+  strippeddir=`echo $dir | cut -c 3-`
+  base=`basename $file`
+  if test -z $strippeddir
+  then
+    echo "#include \"../taglib/$base\"" > ../include/$base
+  else
+    echo "#include \"../taglib/$strippeddir/$base\"" > ../include/$base
+  fi
+done
--- a/include/aifffile.h
+++ b/include/aifffile.h
@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aifffile.h"
--- a/include/aiffproperties.h
+++ b/include/aiffproperties.h
@@ -0,0 +1 @@
+#include "../taglib/riff/aiff/aiffproperties.h"
--- a/include/apefooter.h
+++ b/include/apefooter.h
@@ -0,0 +1 @@
+#include "../taglib/ape/apefooter.h"
--- a/include/apeitem.h
+++ b/include/apeitem.h
@@ -0,0 +1 @@
+#include "../taglib/ape/apeitem.h"
--- a/include/apetag.h
+++ b/include/apetag.h
@@ -0,0 +1 @@
+#include "../taglib/ape/apetag.h"
--- a/include/asfattribute.h
+++ b/include/asfattribute.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asfattribute.h"
--- a/include/asffile.h
+++ b/include/asffile.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asffile.h"
--- a/include/asfproperties.h
+++ b/include/asfproperties.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asfproperties.h"
--- a/include/asftag.h
+++ b/include/asftag.h
@@ -0,0 +1 @@
+#include "../taglib/asf/asftag.h"
--- a/include/attachedpictureframe.h
+++ b/include/attachedpictureframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"
--- a/include/audioproperties.h
+++ b/include/audioproperties.h
@@ -0,0 +1 @@
+#include "../taglib/audioproperties.h"
--- a/include/commentsframe.h
+++ b/include/commentsframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/commentsframe.h"
--- a/include/fileref.h
+++ b/include/fileref.h
@@ -0,0 +1 @@
+#include "../taglib/fileref.h"
--- a/include/flacfile.h
+++ b/include/flacfile.h
@@ -0,0 +1 @@
+#include "../taglib/flac/flacfile.h"
--- a/include/flacproperties.h
+++ b/include/flacproperties.h
@@ -0,0 +1 @@
+#include "../taglib/flac/flacproperties.h"
--- a/include/generalencapsulatedobjectframe.h
+++ b/include/generalencapsulatedobjectframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"
--- a/include/id3v1genres.h
+++ b/include/id3v1genres.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1genres.h"
--- a/include/id3v1tag.h
+++ b/include/id3v1tag.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v1/id3v1tag.h"
--- a/include/id3v2extendedheader.h
+++ b/include/id3v2extendedheader.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"
--- a/include/id3v2footer.h
+++ b/include/id3v2footer.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2footer.h"
--- a/include/id3v2frame.h
+++ b/include/id3v2frame.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2frame.h"
--- a/include/id3v2framefactory.h
+++ b/include/id3v2framefactory.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2framefactory.h"
--- a/include/id3v2header.h
+++ b/include/id3v2header.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2header.h"
--- a/include/id3v2synchdata.h
+++ b/include/id3v2synchdata.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2synchdata.h"
--- a/include/id3v2tag.h
+++ b/include/id3v2tag.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/id3v2tag.h"
--- a/include/mp4atom.h
+++ b/include/mp4atom.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4atom.h"
--- a/include/mp4coverart.h
+++ b/include/mp4coverart.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4coverart.h"
--- a/include/mp4file.h
+++ b/include/mp4file.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4file.h"
--- a/include/mp4item.h
+++ b/include/mp4item.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4item.h"
--- a/include/mp4properties.h
+++ b/include/mp4properties.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4properties.h"
--- a/include/mp4tag.h
+++ b/include/mp4tag.h
@@ -0,0 +1 @@
+#include "../taglib/mp4/mp4tag.h"
--- a/include/mpcfile.h
+++ b/include/mpcfile.h
@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcfile.h"
--- a/include/mpcproperties.h
+++ b/include/mpcproperties.h
@@ -0,0 +1 @@
+#include "../taglib/mpc/mpcproperties.h"
--- a/include/mpegfile.h
+++ b/include/mpegfile.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegfile.h"
--- a/include/mpegheader.h
+++ b/include/mpegheader.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegheader.h"
--- a/include/mpegproperties.h
+++ b/include/mpegproperties.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/mpegproperties.h"
--- a/include/oggfile.h
+++ b/include/oggfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/oggfile.h"
--- a/include/oggflacfile.h
+++ b/include/oggflacfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/flac/oggflacfile.h"
--- a/include/oggpage.h
+++ b/include/oggpage.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpage.h"
--- a/include/oggpageheader.h
+++ b/include/oggpageheader.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/oggpageheader.h"
--- a/include/popularimeterframe.h
+++ b/include/popularimeterframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/popularimeterframe.h"
--- a/include/privateframe.h
+++ b/include/privateframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/privateframe.h"
--- a/include/relativevolumeframe.h
+++ b/include/relativevolumeframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/relativevolumeframe.h"
--- a/include/rifffile.h
+++ b/include/rifffile.h
@@ -0,0 +1 @@
+#include "../taglib/riff/rifffile.h"
--- a/include/speexfile.h
+++ b/include/speexfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexfile.h"
--- a/include/speexproperties.h
+++ b/include/speexproperties.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/speex/speexproperties.h"
--- a/include/tag.h
+++ b/include/tag.h
@@ -0,0 +1 @@
+#include "../taglib/tag.h"
--- a/include/taglib.h
+++ b/include/taglib.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/taglib.h"
--- a/include/taglib_export.h
+++ b/include/taglib_export.h
@@ -0,0 +1 @@
+#include "../taglib/taglib_export.h"
--- a/include/tagunion.h
+++ b/include/tagunion.h
@@ -0,0 +1 @@
+#include "../taglib/tagunion.h"
--- a/include/tbytevector.h
+++ b/include/tbytevector.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevector.h"
--- a/include/tbytevectorlist.h
+++ b/include/tbytevectorlist.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tbytevectorlist.h"
--- a/include/tdebug.h
+++ b/include/tdebug.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tdebug.h"
--- a/include/textidentificationframe.h
+++ b/include/textidentificationframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/textidentificationframe.h"
--- a/include/tfile.h
+++ b/include/tfile.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tfile.h"
--- a/include/tlist.h
+++ b/include/tlist.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tlist.h"
--- a/include/tmap.h
+++ b/include/tmap.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tmap.h"
--- a/include/trueaudiofile.h
+++ b/include/trueaudiofile.h
@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudiofile.h"
--- a/include/trueaudioproperties.h
+++ b/include/trueaudioproperties.h
@@ -0,0 +1 @@
+#include "../taglib/trueaudio/trueaudioproperties.h"
--- a/include/tstring.h
+++ b/include/tstring.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstring.h"
--- a/include/tstringlist.h
+++ b/include/tstringlist.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/tstringlist.h"
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -0,0 +1 @@
+#include "../taglib/toolkit/unicode.h"
--- a/include/uniquefileidentifierframe.h
+++ b/include/uniquefileidentifierframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h"
--- a/include/unknownframe.h
+++ b/include/unknownframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unknownframe.h"
--- a/include/unsynchronizedlyricsframe.h
+++ b/include/unsynchronizedlyricsframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h"
--- a/include/urllinkframe.h
+++ b/include/urllinkframe.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/id3v2/frames/urllinkframe.h"
--- a/include/vorbisfile.h
+++ b/include/vorbisfile.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisfile.h"
--- a/include/vorbisproperties.h
+++ b/include/vorbisproperties.h
@@ -0,0 +1 @@
+#include "../taglib/ogg/vorbis/vorbisproperties.h"
--- a/include/wavfile.h
+++ b/include/wavfile.h
@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavfile.h"
--- a/include/wavpackfile.h
+++ b/include/wavpackfile.h
@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackfile.h"
--- a/include/wavpackproperties.h
+++ b/include/wavpackproperties.h
@@ -0,0 +1 @@
+#include "../taglib/wavpack/wavpackproperties.h"
--- a/include/wavproperties.h
+++ b/include/wavproperties.h
@@ -0,0 +1 @@
+#include "../taglib/riff/wav/wavproperties.h"
--- a/include/xingheader.h
+++ b/include/xingheader.h
@@ -0,0 +1 @@
+#include "../taglib/mpeg/xingheader.h"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Lukáš Lalinský	fddf3ed51b	Changelog	2012-07-11 12:31:00 +02:00
Jonathan Liu	e2bdbb2cd1	Use the default frame factory when it's necessary to parse ID3v2 tags in APE files https://bugs.kde.org/show_bug.cgi?id=278773	2012-07-11 12:29:14 +02:00
				`@@ -0,0 +1 @@`
				`#include "../taglib/riff/aiff/aiffproperties.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/frames/attachedpictureframe.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/frames/commentsframe.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v1/id3v1genres.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2extendedheader.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2footer.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2frame.h"`
				`@@ -0,0 +1 @@`
				`#include "../taglib/mpeg/id3v2/id3v2header.h"`