Release 0.5.4

correct order

.travis.yml

@@ -2,7 +2,7 @@ sudo: required
 language: C++
 os:
   - linux
-  #- osx
+  - osx
 services:
   - docker
 compiler:
@@ -22,7 +22,7 @@ before_install:
       git pull;
       brew update;
       brew unlink python;
-      brew install glib pkgconfig libffi protobuf protobuf-c qt gettext;
+      brew install glib pkgconfig libffi protobuf protobuf-c qt gettext gnutls fftw;
       brew install sqlite --with-fts;
       brew install gstreamer gst-plugins-base;
       brew install gst-plugins-good --with-flac;
@@ -32,6 +32,7 @@ before_install:
       export Qt5_DIR=/usr/local/opt/qt5/lib/cmake;
       export Qt5LinguistTools_DIR=/usr/local/Cellar/qt/$(ls /usr/local/Cellar/qt | head -n1)/lib/cmake/Qt5LinguistTools;
       export PATH="/usr/local/opt/gettext/bin:$PATH";
+      export PKG_CONFIG_PATH=/usr/local/Cellar/libffi/$(ls /usr/local/Cellar/libffi | head -n1)/lib/pkgconfig/:$PKG_CONFIG_PATH;
       ls /usr/local/lib/gstreamer-1.0;
     fi
 before_script:

3rdparty/qocoa/CMakeLists.txt

@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.8.11)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__")
 
 set(SOURCES)
 

3rdparty/singleapplication/CMakeLists.txt

@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 2.8.11)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -Wall -Woverloaded-virtual -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -fpermissive")
 
 set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)

3rdparty/taglib/CMakeLists.txt

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 2.8.11)
+
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
 set(CMAKE_CXX_STANDARD 11)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-virtual-dtor")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -U__STRICT_ANSI__ -fpermissive -Wall -Woverloaded-virtual -Wno-sign-compare -Wno-deprecated-declarations -Wno-unused-local-typedefs -Wno-delete-non-virtual-dtor")
 
 set(TAGLIB_SOVERSION_CURRENT  17)
 set(TAGLIB_SOVERSION_REVISION 0)
@@ -19,8 +21,13 @@ else()
   add_definitions(-DSYSTEM_BYTEORDER=2)
 endif()
 
+include(ConfigureChecks.cmake)
+configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
 configure_file(taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)
 
+add_definitions(-DHAVE_CONFIG_H)
+add_definitions(-DTAGLIB_STATIC)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/toolkit

3rdparty/taglib/ConfigureChecks.cmake

@@ -0,0 +1,215 @@
+include(CheckLibraryExists)
+include(CheckTypeSize)
+include(CheckCXXSourceCompiles)
+
+# Check if the size of numeric types are suitable.
+
+check_type_size("short" SIZEOF_SHORT)
+if(NOT ${SIZEOF_SHORT} EQUAL 2)
+  message(FATAL_ERROR "TagLib requires that short is 16-bit wide.")
+endif()
+
+check_type_size("int" SIZEOF_INT)
+if(NOT ${SIZEOF_INT} EQUAL 4)
+  message(FATAL_ERROR "TagLib requires that int is 32-bit wide.")
+endif()
+
+check_type_size("long long" SIZEOF_LONGLONG)
+if(NOT ${SIZEOF_LONGLONG} EQUAL 8)
+  message(FATAL_ERROR "TagLib requires that long long is 64-bit wide.")
+endif()
+
+check_type_size("wchar_t" SIZEOF_WCHAR_T)
+if(${SIZEOF_WCHAR_T} LESS 2)
+  message(FATAL_ERROR "TagLib requires that wchar_t is sufficient to store a UTF-16 char.")
+endif()
+
+check_type_size("float" SIZEOF_FLOAT)
+if(NOT ${SIZEOF_FLOAT} EQUAL 4)
+  message(FATAL_ERROR "TagLib requires that float is 32-bit wide.")
+endif()
+
+check_type_size("double" SIZEOF_DOUBLE)
+if(NOT ${SIZEOF_DOUBLE} EQUAL 8)
+  message(FATAL_ERROR "TagLib requires that double is 64-bit wide.")
+endif()
+
+# Determine which kind of atomic operations your compiler supports.
+
+check_cxx_source_compiles("
+  #include <atomic>
+  int main() {
+    std::atomic_int x(1);
+    ++x;
+    --x;
+    return 0;
+  }
+" HAVE_STD_ATOMIC)
+
+if(NOT HAVE_STD_ATOMIC)
+  check_cxx_source_compiles("
+    int main() {
+      volatile int x;
+      __sync_add_and_fetch(&x, 1);
+      int y = __sync_sub_and_fetch(&x, 1);
+      return 0;
+    }
+  " HAVE_GCC_ATOMIC)
+
+  if(NOT HAVE_GCC_ATOMIC)
+    check_cxx_source_compiles("
+      #include <libkern/OSAtomic.h>
+      int main() {
+        volatile int32_t x;
+        OSAtomicIncrement32Barrier(&x);
+        int32_t y = OSAtomicDecrement32Barrier(&x);
+        return 0;
+      }
+    " HAVE_MAC_ATOMIC)
+
+    if(NOT HAVE_MAC_ATOMIC)
+      check_cxx_source_compiles("
+        #include <windows.h>
+        int main() {
+          volatile LONG x;
+          InterlockedIncrement(&x);
+          LONG y = InterlockedDecrement(&x);
+          return 0;
+        }
+      " HAVE_WIN_ATOMIC)
+
+      if(NOT HAVE_WIN_ATOMIC)
+        check_cxx_source_compiles("
+          #include <ia64intrin.h>
+          int main() {
+            volatile int x;
+            __sync_add_and_fetch(&x, 1);
+            int y = __sync_sub_and_fetch(&x, 1);
+            return 0;
+          }
+        " HAVE_IA64_ATOMIC)
+      endif()
+    endif()
+  endif()
+endif()
+
+# 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()

3rdparty/taglib/ape/apefile.cpp

@@ -44,7 +44,7 @@
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -100,7 +100,7 @@ bool APE::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -108,7 +108,7 @@ APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
 }
 
 APE::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -120,7 +120,7 @@ APE::File::~File()
   delete d;
 }
 
-TagLib::Tag *APE::File::tag() const
+Strawberry_TagLib::TagLib::Tag *APE::File::tag() const
 {
   return &d->tag;
 }

3rdparty/taglib/ape/apefile.h

@@ -38,6 +38,7 @@
 #include "taglib_export.h"
 #include "apeproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   class Tag;
@@ -56,16 +57,16 @@ namespace TagLib {
 
   namespace APE {
 
-    //! An implementation of TagLib::File with APE specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with APE specific methods
 
     /*!
      * This implements and provides an interface for APE files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to APE files.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -113,7 +114,7 @@ namespace TagLib {
        * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag
        * or a combination of the two.
        */
-      virtual TagLib::Tag *tag() const;
+      virtual Strawberry_TagLib::TagLib::Tag *tag() const;
 
       /*!
        * Implements the unified property interface -- export function.
@@ -231,5 +232,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/ape/apefooter.cpp

@@ -32,7 +32,7 @@
 
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
 class APE::Footer::FooterPrivate

3rdparty/taglib/ape/apefooter.h

@@ -29,6 +29,7 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace APE {
@@ -169,5 +170,6 @@ namespace TagLib {
 
   }
 }
+}
 
 #endif

3rdparty/taglib/ape/apeitem.cpp

@@ -28,7 +28,7 @@
 
 #include "apeitem.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
 class APE::Item::ItemPrivate

3rdparty/taglib/ape/apeitem.h

@@ -30,6 +30,7 @@
 #include "tstring.h"
 #include "tstringlist.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace APE {
@@ -218,6 +219,7 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif
 

3rdparty/taglib/ape/apeproperties.cpp

@@ -36,7 +36,7 @@
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class APE::Properties::PropertiesPrivate
 {

3rdparty/taglib/ape/apeproperties.h

@@ -33,6 +33,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace APE {
@@ -139,5 +140,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/ape/apetag.cpp

@@ -42,7 +42,7 @@
 #include "apefooter.h"
 #include "apeitem.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace APE;
 
 namespace
@@ -91,13 +91,13 @@ public:
 ////////////////////////////////////////////////////////////////////////////////
 
 APE::Tag::Tag() :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
 }
 
-APE::Tag::Tag(TagLib::File *file, long footerLocation) :
-  TagLib::Tag(),
+APE::Tag::Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation) :
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
   d->file = file;

3rdparty/taglib/ape/apetag.h

@@ -34,6 +34,7 @@
 
 #include "apeitem.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   class File;
@@ -54,7 +55,7 @@ namespace TagLib {
 
     //! An APE tag implementation
 
-    class TAGLIB_EXPORT Tag : public TagLib::Tag
+    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
     {
     public:
       /*!
@@ -66,7 +67,7 @@ namespace TagLib {
        * Create an APE tag and parse the data in \a file with APE footer at
        * \a tagOffset.
        */
-      Tag(TagLib::File *file, long footerLocation);
+      Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation);
 
       /*!
        * Destroys this Tag instance.
@@ -204,5 +205,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/asf/asfattribute.cpp

@@ -31,7 +31,7 @@
 #include "asffile.h"
 #include "asfutils.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class ASF::Attribute::AttributePrivate : public RefCounter
 {

3rdparty/taglib/asf/asfattribute.h

@@ -31,6 +31,7 @@
 #include "taglib_export.h"
 #include "asfpicture.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib
 {
 
@@ -80,7 +81,7 @@ namespace TagLib
        * only one may be of type 1 and only one may be of type 2.
        *
        * The specification also states that the description of the picture can be no longer than 64 characters, but can be empty.
-       * WM/Picture attributes added with TagLib::ASF are not automatically validated to conform to ID3 specifications.
+       * WM/Picture attributes added with Strawberry_TagLib::TagLib::ASF are not automatically validated to conform to ID3 specifications.
        * You must add code in your application to perform validations if you want to maintain complete compatibility with ID3.
        */
       Attribute(const Picture &value);
@@ -204,5 +205,6 @@ namespace TagLib
   }
 
 }
+}
 
 #endif

3rdparty/taglib/asf/asffile.cpp

@@ -34,7 +34,7 @@
 #include "asfproperties.h"
 #include "asfutils.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class ASF::File::FilePrivate
 {
@@ -113,7 +113,7 @@ class ASF::File::FilePrivate::UnknownObject : public ASF::File::FilePrivate::Bas
 {
   ByteVector myGuid;
 public:
-  UnknownObject(const ByteVector &guid);
+  explicit UnknownObject(const ByteVector &guid);
   ByteVector guid() const;
 };
 
@@ -488,7 +488,7 @@ bool ASF::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 ASF::File::File(FileName file, bool, Properties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -496,7 +496,7 @@ ASF::File::File(FileName file, bool, Properties::ReadStyle) :
 }
 
 ASF::File::File(IOStream *stream, bool, Properties::ReadStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
   if(isOpen())

3rdparty/taglib/asf/asffile.h

@@ -32,6 +32,7 @@
 #include "asfproperties.h"
 #include "asftag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   //! An implementation of ASF (WMA) metadata
@@ -39,11 +40,11 @@ namespace TagLib {
 
     /*!
      * This implements and provides an interface for ASF files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to ASF files.
      */
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
 
@@ -79,7 +80,7 @@ namespace TagLib {
        * Returns a pointer to the ASF tag of the file.
        *
        * ASF::Tag implements the tag interface, so this serves as the
-       * reimplementation of TagLib::File::tag().
+       * reimplementation of Strawberry_TagLib::TagLib::File::tag().
        *
        * \note The Tag <b>is still</b> owned by the ASF::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
@@ -134,5 +135,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/asf/asfpicture.cpp

@@ -32,7 +32,7 @@
 #include "asfpicture.h"
 #include "asfutils.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class ASF::Picture::PicturePrivate : public RefCounter
 {

3rdparty/taglib/asf/asfpicture.h

@@ -31,6 +31,7 @@
 #include "taglib_export.h"
 #include "attachedpictureframe.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib
 {
   namespace ASF
@@ -218,5 +219,6 @@ namespace TagLib
       };
   }
 }
+}
 
 #endif // ASFPICTURE_H

3rdparty/taglib/asf/asfproperties.cpp

@@ -27,7 +27,7 @@
 #include <tstring.h>
 #include "asfproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class ASF::Properties::PropertiesPrivate
 {

3rdparty/taglib/asf/asfproperties.h

@@ -30,6 +30,7 @@
 #include "tstring.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ASF {
@@ -182,5 +183,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/asf/asftag.cpp

@@ -26,7 +26,7 @@
 #include <tpropertymap.h>
 #include "asftag.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class ASF::Tag::TagPrivate
 {
@@ -40,7 +40,7 @@ public:
 };
 
 ASF::Tag::Tag() :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
 }
@@ -204,7 +204,7 @@ void ASF::Tag::addAttribute(const String &name, const Attribute &attribute)
 
 bool ASF::Tag::isEmpty() const
 {
-  return TagLib::Tag::isEmpty() &&
+  return Strawberry_TagLib::TagLib::Tag::isEmpty() &&
          copyright().isEmpty() &&
          rating().isEmpty() &&
          d->attributeListMap.isEmpty();

3rdparty/taglib/asf/asftag.h

@@ -32,6 +32,7 @@
 #include "taglib_export.h"
 #include "asfattribute.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ASF {
@@ -39,7 +40,7 @@ namespace TagLib {
     typedef List<Attribute> AttributeList;
     typedef Map<String, AttributeList> AttributeListMap;
 
-    class TAGLIB_EXPORT Tag : public TagLib::Tag {
+    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
 
       friend class File;
 
@@ -206,4 +207,5 @@ namespace TagLib {
     };
   }
 }
+}
 #endif

3rdparty/taglib/asf/asfutils.h

@@ -30,6 +30,7 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
+namespace Strawberry_TagLib {
 namespace TagLib
 {
   namespace ASF
@@ -98,6 +99,7 @@ namespace TagLib
     }
   }
 }
+}
 
 #endif
 

3rdparty/taglib/audioproperties.cpp

@@ -43,7 +43,7 @@
 
 #include "audioproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 // This macro is a workaround for the fact that we can't add virtual functions.
 // Should be true virtual functions in taglib2.

3rdparty/taglib/audioproperties.h

@@ -28,6 +28,7 @@
 
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   //! A simple, abstract interface to common audio properties
@@ -35,7 +36,7 @@ namespace TagLib {
   /*!
    * The values here are common to most audio formats.  For more specific, codec
    * dependent values, please see see the subclasses APIs.  This is meant to
-   * compliment the TagLib::File and TagLib::Tag APIs in providing a simple
+   * compliment the Strawberry_TagLib::TagLib::File and Strawberry_TagLib::TagLib::Tag APIs in providing a simple
    * interface that is sufficient for most applications.
    */
 
@@ -123,5 +124,6 @@ namespace TagLib {
   };
 
 }
+}
 
 #endif

3rdparty/taglib/config.h.cmake

@@ -0,0 +1,35 @@
+/* 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_STD_ATOMIC 1
+#cmakedefine   HAVE_GCC_ATOMIC 1
+#cmakedefine   HAVE_MAC_ATOMIC 1
+#cmakedefine   HAVE_WIN_ATOMIC 1
+#cmakedefine   HAVE_IA64_ATOMIC 1
+
+/* Defined if your compiler supports some safer version of vsprintf */
+#cmakedefine   HAVE_VSNPRINTF 1
+#cmakedefine   HAVE_VSPRINTF_S 1
+
+/* Defined if your compiler supports ISO _strdup */
+#cmakedefine   HAVE_ISO_STRDUP 1
+
+/* Defined if zlib is installed */
+#cmakedefine   HAVE_ZLIB 1
+
+/* Indicates whether debug messages are shown even in release mode */
+#cmakedefine   TRACE_IN_RELEASE 1
+
+#cmakedefine TESTS_DIR "@TESTS_DIR@"
+
+#endif

3rdparty/taglib/dsdiff/dsdiffdiintag.cpp

@@ -27,7 +27,7 @@
 #include "tstringlist.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace DSDIFF::DIIN;
 
 class DSDIFF::DIIN::Tag::TagPrivate
@@ -41,7 +41,7 @@ public:
   String artist;
 };
 
-DSDIFF::DIIN::Tag::Tag() : TagLib::Tag()
+DSDIFF::DIIN::Tag::Tag() : Strawberry_TagLib::TagLib::Tag()
 {
   d = new TagPrivate;
 }

3rdparty/taglib/dsdiff/dsdiffdiintag.h

@@ -28,6 +28,7 @@
 
 #include "tag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace DSDIFF {
@@ -39,7 +40,7 @@ namespace TagLib {
        *
        * Only Title and Artist tags are supported
        */
-      class TAGLIB_EXPORT Tag : public TagLib::Tag
+      class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
       {
       public:
         Tag();
@@ -145,6 +146,7 @@ namespace TagLib {
     }
   }
 }
+}
 
 #endif
 

3rdparty/taglib/dsdiff/dsdifffile.cpp

@@ -33,7 +33,7 @@
 #include "tagunion.h"
 #include "dsdifffile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 struct Chunk64
 {
@@ -115,7 +115,7 @@ bool DSDIFF::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 DSDIFF::File::File(FileName file, bool readProperties,
-                   Properties::ReadStyle propertiesStyle) : TagLib::File(file)
+                   Properties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(file)
 {
   d = new FilePrivate;
   d->endianness = BigEndian;
@@ -124,7 +124,7 @@ DSDIFF::File::File(FileName file, bool readProperties,
 }
 
 DSDIFF::File::File(IOStream *stream, bool readProperties,
-                   Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
+                   Properties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(stream)
 {
   d = new FilePrivate;
   d->endianness = BigEndian;
@@ -137,7 +137,7 @@ DSDIFF::File::~File()
   delete d;
 }
 
-TagLib::Tag *DSDIFF::File::tag() const
+Strawberry_TagLib::TagLib::Tag *DSDIFF::File::tag() const
 {
   return &d->tag;
 }

3rdparty/taglib/dsdiff/dsdifffile.h

@@ -31,6 +31,7 @@
 #include "dsdiffproperties.h"
 #include "dsdiffdiintag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   //! An implementation of DSDIFF metadata
@@ -49,16 +50,16 @@ namespace TagLib {
 
   namespace DSDIFF {
 
-    //! An implementation of TagLib::File with DSDIFF specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with DSDIFF specific methods
 
     /*!
      * This implements and provides an interface for DSDIFF files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to DSDIFF files.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -255,6 +256,7 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif
 

3rdparty/taglib/dsdiff/dsdiffproperties.cpp

@@ -28,7 +28,7 @@
 
 #include "dsdiffproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class DSDIFF::Properties::PropertiesPrivate
 {

3rdparty/taglib/dsdiff/dsdiffproperties.h

@@ -28,6 +28,7 @@
 
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace DSDIFF {
@@ -78,6 +79,7 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif
 

3rdparty/taglib/dsf/dsffile.cpp

@@ -32,7 +32,7 @@
 
 #include "dsffile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 // The DSF specification is located at http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
 
@@ -40,8 +40,10 @@ class DSF::File::FilePrivate
 {
 public:
   FilePrivate() :
-  properties(0),
-  tag(0)
+  fileSize(0),
+  metadataOffset(0),
+  properties(nullptr),
+  tag(nullptr)
   {
   }
 
@@ -74,7 +76,7 @@ bool DSF::File::isSupported(IOStream *stream)
 
 DSF::File::File(FileName file, bool readProperties,
                 Properties::ReadStyle propertiesStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -83,7 +85,7 @@ DSF::File::File(FileName file, bool readProperties,
 
 DSF::File::File(IOStream *stream, bool readProperties,
                 Properties::ReadStyle propertiesStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
   if(isOpen())

3rdparty/taglib/dsf/dsffile.h

@@ -30,6 +30,7 @@
 #include "id3v2tag.h"
 #include "dsfproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   //! An implementation of DSF metadata
@@ -42,16 +43,16 @@ namespace TagLib {
 
   namespace DSF {
 
-    //! An implementation of TagLib::File with DSF specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with DSF specific methods
 
     /*!
      * This implements and provides an interface for DSF files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to DSF files.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -123,6 +124,7 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif
 

3rdparty/taglib/dsf/dsfproperties.cpp

@@ -28,7 +28,7 @@
 
 #include "dsfproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class DSF::Properties::PropertiesPrivate
 {
@@ -66,7 +66,7 @@ public:
 // public members
 ////////////////////////////////////////////////////////////////////////////////
 
-DSF::Properties::Properties(const ByteVector &data, ReadStyle style) : TagLib::AudioProperties(style)
+DSF::Properties::Properties(const ByteVector &data, ReadStyle style) : Strawberry_TagLib::TagLib::AudioProperties(style)
 {
   d = new PropertiesPrivate;
   read(data);

3rdparty/taglib/dsf/dsfproperties.h

@@ -28,6 +28,7 @@
 
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace DSF {
@@ -41,7 +42,7 @@ namespace TagLib {
      * API.
      */
 
-    class TAGLIB_EXPORT Properties : public TagLib::AudioProperties
+    class TAGLIB_EXPORT Properties : public Strawberry_TagLib::TagLib::AudioProperties
     {
     public:
       /*!
@@ -87,6 +88,7 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif
 

3rdparty/taglib/fileref.cpp

@@ -55,7 +55,7 @@
 #include "dsffile.h"
 #include "dsdifffile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -74,7 +74,7 @@ namespace
         return file;
     }
 
-    return 0;
+    return nullptr;
   }
 
   // Detect the file type based on the file extension.
@@ -98,7 +98,7 @@ namespace
     // that a default file type resolver is created.
 
     if(ext.isEmpty())
-      return 0;
+      return nullptr;
 
     // .oga can be any audio in the Ogg container. So leave it to content-based detection.
 
@@ -142,7 +142,7 @@ namespace
     if(ext == "DSF")
       return new DSF::File(stream, readAudioProperties, audioPropertiesStyle);
 
-    return 0;
+    return nullptr;
   }
 
   // Detect the file type based on the actual content of the stream.
@@ -194,7 +194,7 @@ namespace
         delete file;
     }
 
-    return 0;
+    return nullptr;
   }
 
   // Internal function that supports FileRef::create().
@@ -220,7 +220,7 @@ namespace
       ext = s.substr(pos + 1).upper();
 
     if(ext.isEmpty())
-      return 0;
+      return nullptr;
 
     if(ext == "MP3")
       return new MPEG::File(fileName, ID3v2::FrameFactory::instance(), readAudioProperties, audioPropertiesStyle);
@@ -270,7 +270,7 @@ namespace
     if(ext == "DSF")
       return new DSF::File(fileName, readAudioProperties, audioPropertiesStyle);
 
-    return 0;
+    return nullptr;
   }
 }
 
@@ -335,7 +335,7 @@ Tag *FileRef::tag() const
 {
   if(isNull()) {
     debug("FileRef::tag() - Called without a valid file.");
-    return 0;
+    return nullptr;
   }
   return d->file->tag();
 }
@@ -344,7 +344,7 @@ AudioProperties *FileRef::audioProperties() const
 {
   if(isNull()) {
     debug("FileRef::audioProperties() - Called without a valid file.");
-    return 0;
+    return nullptr;
   }
   return d->file->audioProperties();
 }

3rdparty/taglib/fileref.h

@@ -32,6 +32,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   class Tag;
@@ -41,7 +42,7 @@ namespace TagLib {
   /*!
    * FileRef exists to provide a minimal, generic and value-based wrapper around
    * a File.  It is lightweight and implicitly shared, and as such suitable for
-   * pass-by-value use.  This hides some of the uglier details of TagLib::File
+   * pass-by-value use.  This hides some of the uglier details of Strawberry_TagLib::TagLib::File
    * and the non-generic portions of the concrete file implementations.
    *
    * This class is useful in a "simple usage" situation where it is desirable
@@ -72,10 +73,10 @@ namespace TagLib {
    *
    * class MyFileTypeResolver : FileTypeResolver
    * {
-   *   TagLib::File *createFile(TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
+   *   Strawberry_TagLib::TagLib::File *createFile(Strawberry_TagLib::TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
    *   {
    *     if(someCheckForAnMP3File(fileName))
-   *       return new TagLib::MPEG::File(fileName);
+   *       return new Strawberry_TagLib::TagLib::MPEG::File(fileName);
    *     return 0;
    *   }
    * }
@@ -282,6 +283,7 @@ namespace TagLib {
     FileRefPrivate *d;
   };
 
-} // namespace TagLib
+}
+} // namespace Strawberry_TagLib::TagLib
 
 #endif

3rdparty/taglib/flac/flacfile.cpp

@@ -41,7 +41,7 @@
 #include "flacmetadatablock.h"
 #include "flacunknownmetadatablock.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -60,7 +60,7 @@ namespace
 class FLAC::File::FilePrivate
 {
 public:
-  FilePrivate(const ID3v2::FrameFactory *frameFactory = ID3v2::FrameFactory::instance()) :
+  explicit FilePrivate(const ID3v2::FrameFactory *frameFactory = ID3v2::FrameFactory::instance()) :
     ID3v2FrameFactory(frameFactory),
     ID3v2Location(-1),
     ID3v2OriginalSize(0),
@@ -112,7 +112,7 @@ bool FLAC::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -121,7 +121,7 @@ FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
 
 FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
                  bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate(frameFactory))
 {
   if(isOpen())
@@ -130,7 +130,7 @@ FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
 
 FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
                  bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate(frameFactory))
 {
   if(isOpen())
@@ -142,7 +142,7 @@ FLAC::File::~File()
   delete d;
 }
 
-TagLib::Tag *FLAC::File::tag() const
+Strawberry_TagLib::TagLib::Tag *FLAC::File::tag() const
 {
   return &d->tag;
 }

3rdparty/taglib/flac/flacfile.h

@@ -34,6 +34,7 @@
 #include "flacpicture.h"
 #include "flacproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   class Tag;
@@ -54,16 +55,16 @@ namespace TagLib {
 
   namespace FLAC {
 
-    //! An implementation of TagLib::File with FLAC specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with FLAC specific methods
 
     /*!
      * This implements and provides an interface for FLAC files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to FLAC files.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -139,7 +140,7 @@ namespace TagLib {
        * \see ID3v1Tag()
        * \see XiphComment()
        */
-      virtual TagLib::Tag *tag() const;
+      virtual Strawberry_TagLib::TagLib::Tag *tag() const;
 
       /*!
        * Implements the unified property interface -- export function.
@@ -339,5 +340,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/flac/flacmetadatablock.cpp

@@ -27,7 +27,7 @@
 #include <tdebug.h>
 #include "flacmetadatablock.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class FLAC::MetadataBlock::MetadataBlockPrivate
 {

3rdparty/taglib/flac/flacmetadatablock.h

@@ -30,6 +30,7 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace FLAC {
@@ -71,5 +72,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/flac/flacpicture.cpp

@@ -27,7 +27,7 @@
 #include <tdebug.h>
 #include "flacpicture.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class FLAC::Picture::PicturePrivate
 {

3rdparty/taglib/flac/flacpicture.h

@@ -32,6 +32,7 @@
 #include "taglib_export.h"
 #include "flacmetadatablock.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace FLAC {
@@ -204,5 +205,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/flac/flacproperties.cpp

@@ -29,7 +29,7 @@
 #include "flacproperties.h"
 #include "flacfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class FLAC::Properties::PropertiesPrivate
 {

3rdparty/taglib/flac/flacproperties.h

@@ -29,6 +29,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace FLAC {
@@ -144,5 +145,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/flac/flacunknownmetadatablock.cpp

@@ -28,7 +28,7 @@
 #include <tstring.h>
 #include "flacunknownmetadatablock.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
 {

3rdparty/taglib/flac/flacunknownmetadatablock.h

@@ -31,6 +31,7 @@
 #include "taglib_export.h"
 #include "flacmetadatablock.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace FLAC {
@@ -77,5 +78,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/it/itfile.cpp

@@ -30,13 +30,13 @@
 #include "modfileprivate.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace IT;
 
 class IT::File::FilePrivate
 {
 public:
-  FilePrivate(AudioProperties::ReadStyle propertiesStyle)
+  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle)
     : tag(), properties(propertiesStyle)
   {
   }

3rdparty/taglib/it/itfile.h

@@ -29,6 +29,7 @@
 #include "modtag.h"
 #include "itproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace IT {
@@ -105,5 +106,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/it/itproperties.cpp

@@ -26,7 +26,7 @@
 
 #include "itproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace IT;
 
 class IT::Properties::PropertiesPrivate

3rdparty/taglib/it/itproperties.h

@@ -29,6 +29,7 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
   namespace IT {
     class TAGLIB_EXPORT Properties : public AudioProperties {
@@ -103,5 +104,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mod/modfile.cpp

@@ -30,13 +30,13 @@
 #include "modfileprivate.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
 class Mod::File::FilePrivate
 {
 public:
-  FilePrivate(AudioProperties::ReadStyle propertiesStyle)
+  explicit FilePrivate(AudioProperties::ReadStyle propertiesStyle)
     : properties(propertiesStyle)
   {
   }

3rdparty/taglib/mod/modfile.h

@@ -33,11 +33,12 @@
 #include "modtag.h"
 #include "modproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace Mod {
 
-    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::Mod::FileBase
     {
     public:
       /*!
@@ -110,5 +111,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mod/modfilebase.cpp

@@ -27,14 +27,14 @@
 #include "tdebug.h"
 #include "modfilebase.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
-Mod::FileBase::FileBase(FileName file) : TagLib::File(file)
+Mod::FileBase::FileBase(FileName file) : Strawberry_TagLib::TagLib::File(file)
 {
 }
 
-Mod::FileBase::FileBase(IOStream *stream) : TagLib::File(stream)
+Mod::FileBase::FileBase(IOStream *stream) : Strawberry_TagLib::TagLib::File(stream)
 {
 }
 

3rdparty/taglib/mod/modfilebase.h

@@ -34,11 +34,12 @@
 
 #include <algorithm>
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace Mod {
 
-    class TAGLIB_EXPORT FileBase : public TagLib::File
+    class TAGLIB_EXPORT FileBase : public Strawberry_TagLib::TagLib::File
     {
     protected:
       FileBase(FileName file);
@@ -62,5 +63,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mod/modproperties.cpp

@@ -26,7 +26,7 @@
 
 #include "modproperties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
 class Mod::Properties::PropertiesPrivate

3rdparty/taglib/mod/modproperties.h

@@ -29,6 +29,7 @@
 #include "taglib.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace Mod {
@@ -67,5 +68,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mod/modtag.cpp

@@ -28,7 +28,7 @@
 #include "tstringlist.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
 class Mod::Tag::TagPrivate
@@ -44,7 +44,7 @@ public:
 };
 
 Mod::Tag::Tag() :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
 }

3rdparty/taglib/mod/modtag.h

@@ -28,6 +28,7 @@
 
 #include "tag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace Mod {
@@ -44,7 +45,7 @@ namespace TagLib {
      * but it is common practice to abuse instrument/sample/pattern
      * names as multiline comments.  TagLib does so as well.
      */
-    class TAGLIB_EXPORT Tag : public TagLib::Tag
+    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
     {
     public:
       Tag();
@@ -190,5 +191,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mp4/mp4atom.cpp

@@ -29,7 +29,7 @@
 #include <tstring.h>
 #include "mp4atom.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 const char *MP4::Atom::containers[11] = {
     "moov", "udta", "mdia", "meta", "ilst",
@@ -118,7 +118,7 @@ MP4::Atom::find(const char *name1, const char *name2, const char *name3, const c
       return (*it)->find(name2, name3, name4);
     }
   }
-  return 0;
+  return nullptr;
 }
 
 MP4::AtomList
@@ -178,7 +178,7 @@ MP4::Atoms::find(const char *name1, const char *name2, const char *name3, const
       return (*it)->find(name2, name3, name4);
     }
   }
-  return 0;
+  return nullptr;
 }
 
 MP4::AtomList

3rdparty/taglib/mp4/mp4atom.h

@@ -33,12 +33,13 @@
 #include "tfile.h"
 #include "tlist.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace MP4 {
 
     class Atom;
-    typedef TagLib::List<Atom *> AtomList;
+    typedef Strawberry_TagLib::TagLib::List<Atom *> AtomList;
 
     enum AtomDataType
     {
@@ -72,7 +73,7 @@ namespace TagLib {
       ByteVector data;
     };
 
-    typedef TagLib::List<AtomData> AtomDataList;
+    typedef Strawberry_TagLib::TagLib::List<AtomData> AtomDataList;
 
     class Atom
     {
@@ -84,7 +85,7 @@ namespace TagLib {
       AtomList findall(const char *name, bool recursive = false);
       long offset;
       long length;
-      TagLib::ByteVector name;
+      Strawberry_TagLib::TagLib::ByteVector name;
       AtomList children;
     private:
       static const int numContainers = 11;
@@ -105,6 +106,7 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif
 

3rdparty/taglib/mp4/mp4coverart.cpp

@@ -28,7 +28,7 @@
 #include "trefcounter.h"
 #include "mp4coverart.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class MP4::CoverArt::CoverArtPrivate : public RefCounter
 {

3rdparty/taglib/mp4/mp4coverart.h

@@ -31,6 +31,7 @@
 #include "taglib_export.h"
 #include "mp4atom.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace MP4 {
@@ -80,5 +81,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mp4/mp4file.cpp

@@ -32,7 +32,7 @@
 #include "mp4tag.h"
 #include "mp4file.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -88,7 +88,7 @@ bool MP4::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -96,7 +96,7 @@ MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle)
 }
 
 MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
   if(isOpen())

3rdparty/taglib/mp4/mp4file.h

@@ -32,6 +32,7 @@
 #include "mp4properties.h"
 #include "mp4tag.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   //! An implementation of MP4 (AAC, ALAC, ...) metadata
@@ -41,11 +42,11 @@ namespace TagLib {
 
     /*!
      * This implements and provides an interface for MP4 files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to MP4 files.
      */
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -78,7 +79,7 @@ namespace TagLib {
        * Returns a pointer to the MP4 tag of the file.
        *
        * MP4::Tag implements the tag interface, so this serves as the
-       * reimplementation of TagLib::File::tag().
+       * reimplementation of Strawberry_TagLib::TagLib::File::tag().
        *
        * \note The Tag <b>is still</b> owned by the MP4::File and should not be
        * deleted by the user.  It will be deleted when the file (object) is
@@ -139,5 +140,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mp4/mp4item.cpp

@@ -28,7 +28,7 @@
 #include "trefcounter.h"
 #include "mp4item.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class MP4::Item::ItemPrivate : public RefCounter
 {

3rdparty/taglib/mp4/mp4item.h

@@ -30,6 +30,7 @@
 #include "mp4coverart.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace MP4 {
@@ -89,5 +90,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mp4/mp4properties.cpp

@@ -29,7 +29,7 @@
 #include "mp4atom.h"
 #include "mp4properties.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class MP4::Properties::PropertiesPrivate
 {

3rdparty/taglib/mp4/mp4properties.h

@@ -29,6 +29,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace MP4 {
@@ -116,5 +117,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mp4/mp4tag.cpp

@@ -30,7 +30,7 @@
 #include "mp4tag.h"
 #include "id3v1genres.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class MP4::Tag::TagPrivate
 {
@@ -39,7 +39,7 @@ public:
     file(0),
     atoms(0) {}
 
-  TagLib::File *file;
+  Strawberry_TagLib::TagLib::File *file;
   Atoms *atoms;
   ItemMap items;
 };
@@ -49,7 +49,7 @@ MP4::Tag::Tag() :
 {
 }
 
-MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms) :
+MP4::Tag::Tag(Strawberry_TagLib::TagLib::File *file, MP4::Atoms *atoms) :
   d(new TagPrivate())
 {
   d->file = file;

3rdparty/taglib/mp4/mp4tag.h

@@ -35,6 +35,7 @@
 #include "mp4atom.h"
 #include "mp4item.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace MP4 {
@@ -42,14 +43,14 @@ namespace TagLib {
     /*!
      * \deprecated
      */
-    typedef TagLib::Map<String, Item> ItemListMap;
-    typedef TagLib::Map<String, Item> ItemMap;
+    typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemListMap;
+    typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemMap;
 
-    class TAGLIB_EXPORT Tag: public TagLib::Tag
+    class TAGLIB_EXPORT Tag: public Strawberry_TagLib::TagLib::Tag
     {
     public:
         Tag();
-        Tag(TagLib::File *file, Atoms *atoms);
+        Tag(Strawberry_TagLib::TagLib::File *file, Atoms *atoms);
         virtual ~Tag();
         bool save();
 
@@ -153,5 +154,6 @@ namespace TagLib {
   }
 
 }
+}
 
 #endif

3rdparty/taglib/mpc/mpcfile.cpp

@@ -36,7 +36,7 @@
 #include "apetag.h"
 #include "apefooter.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {
@@ -93,7 +93,7 @@ bool MPC::File::isSupported(IOStream *stream)
 ////////////////////////////////////////////////////////////////////////////////
 
 MPC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(file),
+  Strawberry_TagLib::TagLib::File(file),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -101,7 +101,7 @@ MPC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
 }
 
 MPC::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
-  TagLib::File(stream),
+  Strawberry_TagLib::TagLib::File(stream),
   d(new FilePrivate())
 {
   if(isOpen())
@@ -113,7 +113,7 @@ MPC::File::~File()
   delete d;
 }
 
-TagLib::Tag *MPC::File::tag() const
+Strawberry_TagLib::TagLib::Tag *MPC::File::tag() const
 {
   return &d->tag;
 }

3rdparty/taglib/mpc/mpcfile.h

@@ -34,6 +34,7 @@
 
 #include "tlist.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   class Tag;
@@ -53,17 +54,17 @@ namespace TagLib {
 
   namespace MPC {
 
-    //! An implementation of TagLib::File with MPC specific methods
+    //! An implementation of Strawberry_TagLib::TagLib::File with MPC specific methods
 
     /*!
      * This implements and provides an interface for MPC files to the
-     * TagLib::Tag and TagLib::AudioProperties interfaces by way of implementing
-     * the abstract TagLib::File API as well as providing some additional
+     * Strawberry_TagLib::TagLib::Tag and Strawberry_TagLib::TagLib::AudioProperties interfaces by way of implementing
+     * the abstract Strawberry_TagLib::TagLib::File API as well as providing some additional
      * information specific to MPC files.
      * The only invalid tag combination supported is an ID3v1 tag after an APE tag.
      */
 
-    class TAGLIB_EXPORT File : public TagLib::File
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
     {
     public:
       /*!
@@ -113,7 +114,7 @@ namespace TagLib {
        * Returns the Tag for this file.  This will be an APE tag, an ID3v1 tag
        * or a combination of the two.
        */
-      virtual TagLib::Tag *tag() const;
+      virtual Strawberry_TagLib::TagLib::Tag *tag() const;
 
       /*!
        * Implements the unified property interface -- export function.
@@ -234,5 +235,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mpc/mpcproperties.cpp

@@ -31,7 +31,7 @@
 #include "mpcproperties.h"
 #include "mpcfile.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 class MPC::Properties::PropertiesPrivate
 {

3rdparty/taglib/mpc/mpcproperties.h

@@ -29,6 +29,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace MPC {
@@ -154,5 +155,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mpeg/id3v1/id3v1genres.cpp

@@ -25,7 +25,7 @@
 
 #include "id3v1genres.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 
 namespace
 {

3rdparty/taglib/mpeg/id3v1/id3v1genres.h

@@ -30,6 +30,7 @@
 #include "tstringlist.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
   namespace ID3v1 {
 
@@ -62,5 +63,6 @@ namespace TagLib {
     int TAGLIB_EXPORT genreIndex(const String &name);
   }
 }
+}
 
 #endif

3rdparty/taglib/mpeg/id3v1/id3v1tag.cpp

@@ -29,7 +29,7 @@
 #include "id3v1tag.h"
 #include "id3v1genres.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v1;
 
 namespace
@@ -85,13 +85,13 @@ ByteVector ID3v1::StringHandler::render(const String &s) const
 ////////////////////////////////////////////////////////////////////////////////
 
 ID3v1::Tag::Tag() :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
 }
 
 ID3v1::Tag::Tag(File *file, long tagOffset) :
-  TagLib::Tag(),
+  Strawberry_TagLib::TagLib::Tag(),
   d(new TagPrivate())
 {
   d->file = file;

3rdparty/taglib/mpeg/id3v1/id3v1tag.h

@@ -30,6 +30,7 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   class File;
@@ -88,7 +89,7 @@ namespace TagLib {
      * This is an implementation of the ID3v1 format.  ID3v1 is both the simplest
      * and most common of tag formats but is rather limited.  Because of its
      * pervasiveness and the way that applications have been written around the
-     * fields that it provides, the generic TagLib::Tag API is a mirror of what is
+     * fields that it provides, the generic Strawberry_TagLib::TagLib::Tag API is a mirror of what is
      * provided by ID3v1.
      *
      * ID3v1 tags should generally only contain Latin1 information.  However because
@@ -102,7 +103,7 @@ namespace TagLib {
      * truncation happens automatically when the tag is rendered.
      */
 
-    class TAGLIB_EXPORT Tag : public TagLib::Tag
+    class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
     {
     public:
       /*!
@@ -198,5 +199,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp

@@ -28,7 +28,7 @@
 #include <tstringlist.h>
 #include <tdebug.h>
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class AttachedPictureFrame::AttachedPictureFramePrivate
@@ -144,7 +144,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data)
     return;
   }
 
-  d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+  d->type = (Strawberry_TagLib::TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
   d->description = readStringField(data, d->textEncoding, &pos);
 
   d->data = data.mid(pos);
@@ -205,7 +205,7 @@ void AttachedPictureFrameV22::parseFields(const ByteVector &data)
     d->mimeType = "image/" + fixedString;
   }
 
-  d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+  d->type = (Strawberry_TagLib::TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
   d->description = readStringField(data, d->textEncoding, &pos);
 
   d->data = data.mid(pos);

3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h

@@ -30,6 +30,7 @@
 #include "id3v2header.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -226,5 +227,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp

@@ -30,7 +30,7 @@
 
 #include "chapterframe.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class ChapterFrame::ChapterFramePrivate
@@ -236,7 +236,7 @@ ChapterFrame *ChapterFrame::findByElementID(const ID3v2::Tag *tag, const ByteVec
       return frame;
   }
 
-  return 0;
+  return nullptr;
 }
 
 void ChapterFrame::parseFields(const ByteVector &data)

3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h

@@ -30,6 +30,7 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -245,5 +246,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp

@@ -31,7 +31,7 @@
 #include "commentsframe.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class CommentsFrame::CommentsFramePrivate
@@ -136,7 +136,7 @@ CommentsFrame *CommentsFrame::findByDescription(const ID3v2::Tag *tag, const Str
       return frame;
   }
 
-  return 0;
+  return nullptr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////

3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h

@@ -29,6 +29,7 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -176,4 +177,5 @@ namespace TagLib {
 
   }
 }
+}
 #endif

3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp

@@ -29,7 +29,7 @@
 #include <tdebug.h>
 #include <tpropertymap.h>
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class EventTimingCodesFrame::EventTimingCodesFramePrivate

3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h

@@ -29,6 +29,7 @@
 #include "id3v2frame.h"
 #include "tlist.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -116,7 +117,7 @@ namespace TagLib {
       /*!
        * List of synchronized events.
        */
-      typedef TagLib::List<SynchedEvent> SynchedEventList;
+      typedef Strawberry_TagLib::TagLib::List<SynchedEvent> SynchedEventList;
 
       /*!
        * Construct an empty event timing codes frame.
@@ -182,4 +183,5 @@ namespace TagLib {
 
   }
 }
+}
 #endif

3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp

@@ -31,7 +31,7 @@
 
 #include "generalencapsulatedobjectframe.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class GeneralEncapsulatedObjectFrame::GeneralEncapsulatedObjectFramePrivate

3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h

@@ -33,6 +33,7 @@
 #include "id3v2header.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -175,5 +176,6 @@ namespace TagLib {
     };
   }
 }
+}
 
 #endif

3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp

@@ -29,7 +29,7 @@
 
 #include "ownershipframe.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class OwnershipFrame::OwnershipFramePrivate

3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h

@@ -29,6 +29,7 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -148,4 +149,5 @@ namespace TagLib {
 
   }
 }
+}
 #endif

3rdparty/taglib/mpeg/id3v2/frames/podcastframe.cpp

@@ -25,7 +25,7 @@
 
 #include "podcastframe.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class PodcastFrame::PodcastFramePrivate

3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h

@@ -29,6 +29,7 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -77,4 +78,5 @@ namespace TagLib {
 
   }
 }
+}
 #endif

3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp

@@ -27,7 +27,7 @@
 
 #include "popularimeterframe.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;
 
 class PopularimeterFrame::PopularimeterFramePrivate

3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h

@@ -29,6 +29,7 @@
 #include "id3v2frame.h"
 #include "taglib_export.h"
 
+namespace Strawberry_TagLib {
 namespace TagLib {
 
   namespace ID3v2 {
@@ -129,4 +130,5 @@ namespace TagLib {
 
   }
 }
+}
 #endif

3rdparty/taglib/mpeg/id3v2/frames/privateframe.cpp

@@ -30,7 +30,7 @@
 
 #include "privateframe.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace ID3v2;