Change namespaces for compatibility

3rdparty/taglib/ogg/flac/oggflacfile.h

@@ -32,7 +32,8 @@
 
 #include "flacproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   class Tag;
 
@@ -165,6 +166,7 @@ namespace Strawberry_TagLib::TagLib {
     };
   } // namespace FLAC
   } // namespace Ogg
-} // namespace Strawberry_TagLib::TagLib
+} // namespace TagLib
+} // namespace Strawberry_TagLib
 
 #endif

3rdparty/taglib/ogg/oggfile.h

@@ -30,7 +30,8 @@
 #ifndef TAGLIB_OGGFILE_H
 #define TAGLIB_OGGFILE_H
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   //! A namespace for the classes used by Ogg-based metadata files
 
@@ -123,5 +124,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif

3rdparty/taglib/ogg/oggpage.h

@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "tbytevectorlist.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -225,4 +226,5 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 #endif

3rdparty/taglib/ogg/oggpageheader.h

@@ -30,7 +30,8 @@
 #include "tbytevector.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -228,5 +229,6 @@ namespace Strawberry_TagLib::TagLib {
 
   }
 }
+}
 
 #endif

3rdparty/taglib/ogg/opus/opusfile.h

@@ -35,7 +35,8 @@
 
 #include "opusproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -134,5 +135,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif

3rdparty/taglib/ogg/opus/opusproperties.h

@@ -32,7 +32,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -130,5 +131,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif

3rdparty/taglib/ogg/speex/speexfile.h

@@ -35,7 +35,8 @@
 
 #include "speexproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -134,5 +135,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif

3rdparty/taglib/ogg/speex/speexproperties.h

@@ -32,7 +32,8 @@
 
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -125,5 +126,6 @@ namespace Strawberry_TagLib::TagLib {
     }
   }
 }
+}
 
 #endif

3rdparty/taglib/ogg/vorbis/vorbisfile.cpp

@@ -51,13 +51,15 @@ public:
   Properties *properties;
 };
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   /*!
    * Vorbis headers can be found with one type ID byte and the string "vorbis" in
    * an Ogg stream.  0x03 indicates the comment header.
    */
   static const char vorbisCommentHeaderID[] = { 0x03, 'v', 'o', 'r', 'b', 'i', 's', 0 };
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // static members

3rdparty/taglib/ogg/vorbis/vorbisfile.h

@@ -32,7 +32,8 @@
 
 #include "vorbisproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 /*
  * This is just to make this appear to be in the Ogg namespace in the
@@ -152,6 +153,7 @@ namespace Strawberry_TagLib::TagLib {
   namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::Vorbis::File File; } }
 #endif
 
+}
 }
 
 #endif

3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp

@@ -56,13 +56,15 @@ public:
   int bitrateMinimum;
 };
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
   /*!
    * Vorbis headers can be found with one type ID byte and the string "vorbis" in
    * an Ogg stream.  0x01 indicates the setup header.
    */
   static const char vorbisSetupHeaderID[] = { 0x01, 'v', 'o', 'r', 'b', 'i', 's', 0 };
 }
+}
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members

3rdparty/taglib/ogg/vorbis/vorbisproperties.h

@@ -29,7 +29,8 @@
 #include "taglib_export.h"
 #include "audioproperties.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
 /*
  * This is just to make this appear to be in the Ogg namespace in the
@@ -155,6 +156,7 @@ namespace Strawberry_TagLib::TagLib {
   namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::AudioProperties AudioProperties; } }
 #endif
 
+}
 }
 
 #endif

3rdparty/taglib/ogg/xiphcomment.h

@@ -35,7 +35,8 @@
 #include "flacpicture.h"
 #include "taglib_export.h"
 
-namespace Strawberry_TagLib::TagLib {
+namespace Strawberry_TagLib {
+namespace TagLib {
 
   namespace Ogg {
 
@@ -271,5 +272,6 @@ namespace Strawberry_TagLib::TagLib {
     };
   }
 }
+}
 
 #endif