Change namespaces for compatibility

ext/libstrawberry-tagreader/tagreader.h

@@ -35,11 +35,9 @@
 #include "tagreadermessages.pb.h"
 
 #ifndef USE_SYSTEM_TAGLIB
-using namespace Strawberry_TagLib;
-namespace Strawberry_TagLib::TagLib {
-#else
-namespace TagLib {
+namespace Strawberry_TagLib {
 #endif
+namespace TagLib {
   class FileRef;
   class String;
 
@@ -48,6 +46,10 @@ namespace TagLib {
     class PopularimeterFrame;
   }
 }
+#ifndef USE_SYSTEM_TAGLIB
+}
+using namespace Strawberry_TagLib;
+#endif
 
 class FileRefFactory;