Use namespace for static taglib to avoid collision with taglib

linked to vlc
2019-04-25 23:00:25 +02:00
parent ace8ecbb4e
commit 1c926cca45
227 changed files with 460 additions and 447 deletions
--- a/ext/libstrawberry-tagreader/tagreader.cpp
+++ b/ext/libstrawberry-tagreader/tagreader.cpp
@@ -92,6 +92,10 @@
 #include "fmpsparser.h"
 #include "core/timeconstants.h"

+#ifndef USE_SYSTEM_TAGLIB
+using namespace Strawberry_TagLib;
+#endif
+
 class FileRefFactory {
 public:
  virtual ~FileRefFactory() {}
--- a/ext/libstrawberry-tagreader/tagreader.h
+++ b/ext/libstrawberry-tagreader/tagreader.h
@@ -34,7 +34,12 @@

 #include "tagreadermessages.pb.h"

+#ifndef USE_SYSTEM_TAGLIB
+using namespace Strawberry_TagLib;
+namespace Strawberry_TagLib::TagLib {
+#else
 namespace TagLib {
+#endif
  class FileRef;
  class String;