Use namespace for static taglib to avoid collision with taglib

linked to vlc

3rdparty/taglib/mod/modfile.cpp

@@ -30,7 +30,7 @@
 #include "modfileprivate.h"
 #include "tpropertymap.h"
 
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
 using namespace Mod;
 
 class Mod::File::FilePrivate

3rdparty/taglib/mod/modfile.h

@@ -33,11 +33,11 @@
 #include "modtag.h"
 #include "modproperties.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Mod {
 
-    class TAGLIB_EXPORT File : public TagLib::Mod::FileBase
+    class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::Mod::FileBase
     {
     public:
       /*!

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,11 @@
 
 #include <algorithm>
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Mod {
 
-    class TAGLIB_EXPORT FileBase : public TagLib::File
+    class TAGLIB_EXPORT FileBase : public Strawberry_TagLib::TagLib::File
     {
     protected:
       FileBase(FileName file);

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

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,7 +28,7 @@
 
 #include "tag.h"
 
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
 
   namespace Mod {
 
@@ -44,7 +44,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();