Use namespace for static taglib to avoid collision with taglib

linked to vlc

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,7 +31,7 @@
 #include "taglib_export.h"
 #include "asfpicture.h"
 
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
 {
 
   namespace ASF
@@ -80,7 +80,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);

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
 {
@@ -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,18 +32,18 @@
 #include "asfproperties.h"
 #include "asftag.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   //! An implementation of ASF (WMA) metadata
   namespace ASF {
 
     /*!
      * 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 +79,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

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,7 +31,7 @@
 #include "taglib_export.h"
 #include "attachedpictureframe.h"
 
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
 {
   namespace ASF
   {

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,7 +30,7 @@
 #include "tstring.h"
 #include "taglib_export.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace ASF {
 

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,14 +32,14 @@
 #include "taglib_export.h"
 #include "asfattribute.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace ASF {
 
     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;
 

3rdparty/taglib/asf/asfutils.h

@@ -30,7 +30,7 @@
 
 #ifndef DO_NOT_DOCUMENT  // tell Doxygen not to document this header
 
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
 {
   namespace ASF
   {