Use namespace for static taglib to avoid collision with taglib

linked to vlc

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,7 +34,7 @@
 
 #include "tlist.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   class Tag;
 
@@ -53,17 +53,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 +113,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.

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,7 +29,7 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace MPC {