diff --git a/3rdparty/taglib/ape/apefile.cpp b/3rdparty/taglib/ape/apefile.cpp
index a10c1f646..e26e13534 100644
--- a/3rdparty/taglib/ape/apefile.cpp
+++ b/3rdparty/taglib/ape/apefile.cpp
@@ -44,7 +44,7 @@
#include "apetag.h"
#include "apefooter.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -100,7 +100,7 @@ bool APE::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -108,7 +108,7 @@ APE::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
}
APE::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
@@ -120,7 +120,7 @@ APE::File::~File()
delete d;
}
-TagLib::Tag *APE::File::tag() const
+Strawberry_TagLib::TagLib::Tag *APE::File::tag() const
{
return &d->tag;
}
diff --git a/3rdparty/taglib/ape/apefile.h b/3rdparty/taglib/ape/apefile.h
index 267778bae..66ba13499 100644
--- a/3rdparty/taglib/ape/apefile.h
+++ b/3rdparty/taglib/ape/apefile.h
@@ -38,7 +38,7 @@
#include "taglib_export.h"
#include "apeproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class Tag;
@@ -56,16 +56,16 @@ namespace TagLib {
namespace APE {
- //! An implementation of TagLib::File with APE specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with APE specific methods
/*!
* This implements and provides an interface for APE 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 APE files.
*/
- 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.
diff --git a/3rdparty/taglib/ape/apefooter.cpp b/3rdparty/taglib/ape/apefooter.cpp
index c5c99a5a4..62104abac 100644
--- a/3rdparty/taglib/ape/apefooter.cpp
+++ b/3rdparty/taglib/ape/apefooter.cpp
@@ -32,7 +32,7 @@
#include "apefooter.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace APE;
class APE::Footer::FooterPrivate
diff --git a/3rdparty/taglib/ape/apefooter.h b/3rdparty/taglib/ape/apefooter.h
index 47741d0dc..233a21145 100644
--- a/3rdparty/taglib/ape/apefooter.h
+++ b/3rdparty/taglib/ape/apefooter.h
@@ -29,7 +29,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace APE {
diff --git a/3rdparty/taglib/ape/apeitem.cpp b/3rdparty/taglib/ape/apeitem.cpp
index 45f22da47..5f41ca932 100644
--- a/3rdparty/taglib/ape/apeitem.cpp
+++ b/3rdparty/taglib/ape/apeitem.cpp
@@ -28,7 +28,7 @@
#include "apeitem.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace APE;
class APE::Item::ItemPrivate
diff --git a/3rdparty/taglib/ape/apeitem.h b/3rdparty/taglib/ape/apeitem.h
index cfd157c35..f39776f18 100644
--- a/3rdparty/taglib/ape/apeitem.h
+++ b/3rdparty/taglib/ape/apeitem.h
@@ -30,7 +30,7 @@
#include "tstring.h"
#include "tstringlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace APE {
diff --git a/3rdparty/taglib/ape/apeproperties.cpp b/3rdparty/taglib/ape/apeproperties.cpp
index dee7e8c05..3744727ec 100644
--- a/3rdparty/taglib/ape/apeproperties.cpp
+++ b/3rdparty/taglib/ape/apeproperties.cpp
@@ -36,7 +36,7 @@
#include "apetag.h"
#include "apefooter.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class APE::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/ape/apeproperties.h b/3rdparty/taglib/ape/apeproperties.h
index 916254830..092b4ed72 100644
--- a/3rdparty/taglib/ape/apeproperties.h
+++ b/3rdparty/taglib/ape/apeproperties.h
@@ -33,7 +33,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace APE {
diff --git a/3rdparty/taglib/ape/apetag.cpp b/3rdparty/taglib/ape/apetag.cpp
index 79e1d5cc7..66d81e11b 100644
--- a/3rdparty/taglib/ape/apetag.cpp
+++ b/3rdparty/taglib/ape/apetag.cpp
@@ -42,7 +42,7 @@
#include "apefooter.h"
#include "apeitem.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace APE;
namespace
@@ -91,13 +91,13 @@ public:
////////////////////////////////////////////////////////////////////////////////
APE::Tag::Tag() :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
}
-APE::Tag::Tag(TagLib::File *file, long footerLocation) :
- TagLib::Tag(),
+APE::Tag::Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation) :
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
d->file = file;
diff --git a/3rdparty/taglib/ape/apetag.h b/3rdparty/taglib/ape/apetag.h
index f4d4fba64..67bf35582 100644
--- a/3rdparty/taglib/ape/apetag.h
+++ b/3rdparty/taglib/ape/apetag.h
@@ -34,7 +34,7 @@
#include "apeitem.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class File;
@@ -54,7 +54,7 @@ namespace TagLib {
//! An APE tag implementation
- class TAGLIB_EXPORT Tag : public TagLib::Tag
+ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
{
public:
/*!
@@ -66,7 +66,7 @@ namespace TagLib {
* Create an APE tag and parse the data in \a file with APE footer at
* \a tagOffset.
*/
- Tag(TagLib::File *file, long footerLocation);
+ Tag(Strawberry_TagLib::TagLib::File *file, long footerLocation);
/*!
* Destroys this Tag instance.
diff --git a/3rdparty/taglib/asf/asfattribute.cpp b/3rdparty/taglib/asf/asfattribute.cpp
index 6faf7973b..d7765a104 100644
--- a/3rdparty/taglib/asf/asfattribute.cpp
+++ b/3rdparty/taglib/asf/asfattribute.cpp
@@ -31,7 +31,7 @@
#include "asffile.h"
#include "asfutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ASF::Attribute::AttributePrivate : public RefCounter
{
diff --git a/3rdparty/taglib/asf/asfattribute.h b/3rdparty/taglib/asf/asfattribute.h
index 1738eb459..69938dd52 100644
--- a/3rdparty/taglib/asf/asfattribute.h
+++ b/3rdparty/taglib/asf/asfattribute.h
@@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "asfpicture.h"
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
namespace ASF
@@ -80,7 +80,7 @@ namespace TagLib
* only one may be of type 1 and only one may be of type 2.
*
* The specification also states that the description of the picture can be no longer than 64 characters, but can be empty.
- * WM/Picture attributes added with TagLib::ASF are not automatically validated to conform to ID3 specifications.
+ * WM/Picture attributes added with Strawberry_TagLib::TagLib::ASF are not automatically validated to conform to ID3 specifications.
* You must add code in your application to perform validations if you want to maintain complete compatibility with ID3.
*/
Attribute(const Picture &value);
diff --git a/3rdparty/taglib/asf/asffile.cpp b/3rdparty/taglib/asf/asffile.cpp
index d2fae1a55..a228883f3 100644
--- a/3rdparty/taglib/asf/asffile.cpp
+++ b/3rdparty/taglib/asf/asffile.cpp
@@ -34,7 +34,7 @@
#include "asfproperties.h"
#include "asfutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ASF::File::FilePrivate
{
@@ -488,7 +488,7 @@ bool ASF::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
ASF::File::File(FileName file, bool, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -496,7 +496,7 @@ ASF::File::File(FileName file, bool, Properties::ReadStyle) :
}
ASF::File::File(IOStream *stream, bool, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
diff --git a/3rdparty/taglib/asf/asffile.h b/3rdparty/taglib/asf/asffile.h
index 05cf4ee2a..5f9357fdb 100644
--- a/3rdparty/taglib/asf/asffile.h
+++ b/3rdparty/taglib/asf/asffile.h
@@ -32,18 +32,18 @@
#include "asfproperties.h"
#include "asftag.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! An implementation of ASF (WMA) metadata
namespace ASF {
/*!
* This implements and provides an interface for ASF 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 ASF files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
@@ -79,7 +79,7 @@ namespace TagLib {
* Returns a pointer to the ASF tag of the file.
*
* ASF::Tag implements the tag interface, so this serves as the
- * reimplementation of TagLib::File::tag().
+ * reimplementation of Strawberry_TagLib::TagLib::File::tag().
*
* \note The Tag is still owned by the ASF::File and should not be
* deleted by the user. It will be deleted when the file (object) is
diff --git a/3rdparty/taglib/asf/asfpicture.cpp b/3rdparty/taglib/asf/asfpicture.cpp
index 7039fb15f..ca6446146 100644
--- a/3rdparty/taglib/asf/asfpicture.cpp
+++ b/3rdparty/taglib/asf/asfpicture.cpp
@@ -32,7 +32,7 @@
#include "asfpicture.h"
#include "asfutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ASF::Picture::PicturePrivate : public RefCounter
{
diff --git a/3rdparty/taglib/asf/asfpicture.h b/3rdparty/taglib/asf/asfpicture.h
index 17233ba90..a69ec8f79 100644
--- a/3rdparty/taglib/asf/asfpicture.h
+++ b/3rdparty/taglib/asf/asfpicture.h
@@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "attachedpictureframe.h"
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
namespace ASF
{
diff --git a/3rdparty/taglib/asf/asfproperties.cpp b/3rdparty/taglib/asf/asfproperties.cpp
index a836da30b..fd00096b3 100644
--- a/3rdparty/taglib/asf/asfproperties.cpp
+++ b/3rdparty/taglib/asf/asfproperties.cpp
@@ -27,7 +27,7 @@
#include
#include "asfproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ASF::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/asf/asfproperties.h b/3rdparty/taglib/asf/asfproperties.h
index b89349b36..7737fdde4 100644
--- a/3rdparty/taglib/asf/asfproperties.h
+++ b/3rdparty/taglib/asf/asfproperties.h
@@ -30,7 +30,7 @@
#include "tstring.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ASF {
diff --git a/3rdparty/taglib/asf/asftag.cpp b/3rdparty/taglib/asf/asftag.cpp
index 20a946f0a..b2c060382 100644
--- a/3rdparty/taglib/asf/asftag.cpp
+++ b/3rdparty/taglib/asf/asftag.cpp
@@ -26,7 +26,7 @@
#include
#include "asftag.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ASF::Tag::TagPrivate
{
@@ -40,7 +40,7 @@ public:
};
ASF::Tag::Tag() :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
}
@@ -204,7 +204,7 @@ void ASF::Tag::addAttribute(const String &name, const Attribute &attribute)
bool ASF::Tag::isEmpty() const
{
- return TagLib::Tag::isEmpty() &&
+ return Strawberry_TagLib::TagLib::Tag::isEmpty() &&
copyright().isEmpty() &&
rating().isEmpty() &&
d->attributeListMap.isEmpty();
diff --git a/3rdparty/taglib/asf/asftag.h b/3rdparty/taglib/asf/asftag.h
index 049b9f664..5269f8404 100644
--- a/3rdparty/taglib/asf/asftag.h
+++ b/3rdparty/taglib/asf/asftag.h
@@ -32,14 +32,14 @@
#include "taglib_export.h"
#include "asfattribute.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ASF {
typedef List AttributeList;
typedef Map AttributeListMap;
- class TAGLIB_EXPORT Tag : public TagLib::Tag {
+ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
friend class File;
diff --git a/3rdparty/taglib/asf/asfutils.h b/3rdparty/taglib/asf/asfutils.h
index a8ecd70dc..a0308a592 100644
--- a/3rdparty/taglib/asf/asfutils.h
+++ b/3rdparty/taglib/asf/asfutils.h
@@ -30,7 +30,7 @@
#ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
namespace ASF
{
diff --git a/3rdparty/taglib/audioproperties.cpp b/3rdparty/taglib/audioproperties.cpp
index 94cddc72b..d21896674 100644
--- a/3rdparty/taglib/audioproperties.cpp
+++ b/3rdparty/taglib/audioproperties.cpp
@@ -43,7 +43,7 @@
#include "audioproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
// This macro is a workaround for the fact that we can't add virtual functions.
// Should be true virtual functions in taglib2.
diff --git a/3rdparty/taglib/audioproperties.h b/3rdparty/taglib/audioproperties.h
index f27aefca8..ab1029280 100644
--- a/3rdparty/taglib/audioproperties.h
+++ b/3rdparty/taglib/audioproperties.h
@@ -28,14 +28,14 @@
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A simple, abstract interface to common audio properties
/*!
* The values here are common to most audio formats. For more specific, codec
* dependent values, please see see the subclasses APIs. This is meant to
- * compliment the TagLib::File and TagLib::Tag APIs in providing a simple
+ * compliment the Strawberry_TagLib::TagLib::File and Strawberry_TagLib::TagLib::Tag APIs in providing a simple
* interface that is sufficient for most applications.
*/
diff --git a/3rdparty/taglib/dsdiff/dsdiffdiintag.cpp b/3rdparty/taglib/dsdiff/dsdiffdiintag.cpp
index c027410a6..027c850f4 100644
--- a/3rdparty/taglib/dsdiff/dsdiffdiintag.cpp
+++ b/3rdparty/taglib/dsdiff/dsdiffdiintag.cpp
@@ -27,7 +27,7 @@
#include "tstringlist.h"
#include "tpropertymap.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace DSDIFF::DIIN;
class DSDIFF::DIIN::Tag::TagPrivate
@@ -41,7 +41,7 @@ public:
String artist;
};
-DSDIFF::DIIN::Tag::Tag() : TagLib::Tag()
+DSDIFF::DIIN::Tag::Tag() : Strawberry_TagLib::TagLib::Tag()
{
d = new TagPrivate;
}
diff --git a/3rdparty/taglib/dsdiff/dsdiffdiintag.h b/3rdparty/taglib/dsdiff/dsdiffdiintag.h
index 0eff545e2..0596ad50e 100644
--- a/3rdparty/taglib/dsdiff/dsdiffdiintag.h
+++ b/3rdparty/taglib/dsdiff/dsdiffdiintag.h
@@ -28,7 +28,7 @@
#include "tag.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace DSDIFF {
@@ -39,7 +39,7 @@ namespace TagLib {
*
* Only Title and Artist tags are supported
*/
- class TAGLIB_EXPORT Tag : public TagLib::Tag
+ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
{
public:
Tag();
diff --git a/3rdparty/taglib/dsdiff/dsdifffile.cpp b/3rdparty/taglib/dsdiff/dsdifffile.cpp
index 73b2dbb25..153557704 100644
--- a/3rdparty/taglib/dsdiff/dsdifffile.cpp
+++ b/3rdparty/taglib/dsdiff/dsdifffile.cpp
@@ -33,7 +33,7 @@
#include "tagunion.h"
#include "dsdifffile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
struct Chunk64
{
@@ -115,7 +115,7 @@ bool DSDIFF::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
DSDIFF::File::File(FileName file, bool readProperties,
- Properties::ReadStyle propertiesStyle) : TagLib::File(file)
+ Properties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(file)
{
d = new FilePrivate;
d->endianness = BigEndian;
@@ -124,7 +124,7 @@ DSDIFF::File::File(FileName file, bool readProperties,
}
DSDIFF::File::File(IOStream *stream, bool readProperties,
- Properties::ReadStyle propertiesStyle) : TagLib::File(stream)
+ Properties::ReadStyle propertiesStyle) : Strawberry_TagLib::TagLib::File(stream)
{
d = new FilePrivate;
d->endianness = BigEndian;
@@ -137,7 +137,7 @@ DSDIFF::File::~File()
delete d;
}
-TagLib::Tag *DSDIFF::File::tag() const
+Strawberry_TagLib::TagLib::Tag *DSDIFF::File::tag() const
{
return &d->tag;
}
diff --git a/3rdparty/taglib/dsdiff/dsdifffile.h b/3rdparty/taglib/dsdiff/dsdifffile.h
index 8b8887442..fee3fe746 100644
--- a/3rdparty/taglib/dsdiff/dsdifffile.h
+++ b/3rdparty/taglib/dsdiff/dsdifffile.h
@@ -31,7 +31,7 @@
#include "dsdiffproperties.h"
#include "dsdiffdiintag.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! An implementation of DSDIFF metadata
@@ -49,16 +49,16 @@ namespace TagLib {
namespace DSDIFF {
- //! An implementation of TagLib::File with DSDIFF specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with DSDIFF specific methods
/*!
* This implements and provides an interface for DSDIFF 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 DSDIFF files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
diff --git a/3rdparty/taglib/dsdiff/dsdiffproperties.cpp b/3rdparty/taglib/dsdiff/dsdiffproperties.cpp
index b8d362cc0..a51d973ef 100644
--- a/3rdparty/taglib/dsdiff/dsdiffproperties.cpp
+++ b/3rdparty/taglib/dsdiff/dsdiffproperties.cpp
@@ -28,7 +28,7 @@
#include "dsdiffproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class DSDIFF::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/dsdiff/dsdiffproperties.h b/3rdparty/taglib/dsdiff/dsdiffproperties.h
index 6aff03982..f8f94e241 100644
--- a/3rdparty/taglib/dsdiff/dsdiffproperties.h
+++ b/3rdparty/taglib/dsdiff/dsdiffproperties.h
@@ -28,7 +28,7 @@
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace DSDIFF {
diff --git a/3rdparty/taglib/dsf/dsffile.cpp b/3rdparty/taglib/dsf/dsffile.cpp
index 3870a50f7..3f75b91ac 100644
--- a/3rdparty/taglib/dsf/dsffile.cpp
+++ b/3rdparty/taglib/dsf/dsffile.cpp
@@ -32,7 +32,7 @@
#include "dsffile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
// The DSF specification is located at http://dsd-guide.com/sites/default/files/white-papers/DSFFileFormatSpec_E.pdf
@@ -76,7 +76,7 @@ bool DSF::File::isSupported(IOStream *stream)
DSF::File::File(FileName file, bool readProperties,
Properties::ReadStyle propertiesStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -85,7 +85,7 @@ DSF::File::File(FileName file, bool readProperties,
DSF::File::File(IOStream *stream, bool readProperties,
Properties::ReadStyle propertiesStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
diff --git a/3rdparty/taglib/dsf/dsffile.h b/3rdparty/taglib/dsf/dsffile.h
index e75298d7c..6e4ac39a2 100644
--- a/3rdparty/taglib/dsf/dsffile.h
+++ b/3rdparty/taglib/dsf/dsffile.h
@@ -30,7 +30,7 @@
#include "id3v2tag.h"
#include "dsfproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! An implementation of DSF metadata
@@ -42,16 +42,16 @@ namespace TagLib {
namespace DSF {
- //! An implementation of TagLib::File with DSF specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with DSF specific methods
/*!
* This implements and provides an interface for DSF 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 DSF files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
diff --git a/3rdparty/taglib/dsf/dsfproperties.cpp b/3rdparty/taglib/dsf/dsfproperties.cpp
index 18511fa72..5b9423592 100644
--- a/3rdparty/taglib/dsf/dsfproperties.cpp
+++ b/3rdparty/taglib/dsf/dsfproperties.cpp
@@ -28,7 +28,7 @@
#include "dsfproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class DSF::Properties::PropertiesPrivate
{
@@ -66,7 +66,7 @@ public:
// public members
////////////////////////////////////////////////////////////////////////////////
-DSF::Properties::Properties(const ByteVector &data, ReadStyle style) : TagLib::AudioProperties(style)
+DSF::Properties::Properties(const ByteVector &data, ReadStyle style) : Strawberry_TagLib::TagLib::AudioProperties(style)
{
d = new PropertiesPrivate;
read(data);
diff --git a/3rdparty/taglib/dsf/dsfproperties.h b/3rdparty/taglib/dsf/dsfproperties.h
index 273a9f5ae..256fb74af 100644
--- a/3rdparty/taglib/dsf/dsfproperties.h
+++ b/3rdparty/taglib/dsf/dsfproperties.h
@@ -28,7 +28,7 @@
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace DSF {
@@ -41,7 +41,7 @@ namespace TagLib {
* API.
*/
- class TAGLIB_EXPORT Properties : public TagLib::AudioProperties
+ class TAGLIB_EXPORT Properties : public Strawberry_TagLib::TagLib::AudioProperties
{
public:
/*!
diff --git a/3rdparty/taglib/fileref.cpp b/3rdparty/taglib/fileref.cpp
index 2e6a1f5e3..decef55fb 100644
--- a/3rdparty/taglib/fileref.cpp
+++ b/3rdparty/taglib/fileref.cpp
@@ -55,7 +55,7 @@
#include "dsffile.h"
#include "dsdifffile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
diff --git a/3rdparty/taglib/fileref.h b/3rdparty/taglib/fileref.h
index c36f54cbd..468aaa030 100644
--- a/3rdparty/taglib/fileref.h
+++ b/3rdparty/taglib/fileref.h
@@ -32,7 +32,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class Tag;
@@ -41,7 +41,7 @@ namespace TagLib {
/*!
* FileRef exists to provide a minimal, generic and value-based wrapper around
* a File. It is lightweight and implicitly shared, and as such suitable for
- * pass-by-value use. This hides some of the uglier details of TagLib::File
+ * pass-by-value use. This hides some of the uglier details of Strawberry_TagLib::TagLib::File
* and the non-generic portions of the concrete file implementations.
*
* This class is useful in a "simple usage" situation where it is desirable
@@ -72,10 +72,10 @@ namespace TagLib {
*
* class MyFileTypeResolver : FileTypeResolver
* {
- * TagLib::File *createFile(TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
+ * Strawberry_TagLib::TagLib::File *createFile(Strawberry_TagLib::TagLib::FileName *fileName, bool, AudioProperties::ReadStyle) const
* {
* if(someCheckForAnMP3File(fileName))
- * return new TagLib::MPEG::File(fileName);
+ * return new Strawberry_TagLib::TagLib::MPEG::File(fileName);
* return 0;
* }
* }
@@ -282,6 +282,6 @@ namespace TagLib {
FileRefPrivate *d;
};
-} // namespace TagLib
+} // namespace Strawberry_TagLib::TagLib
#endif
diff --git a/3rdparty/taglib/flac/flacfile.cpp b/3rdparty/taglib/flac/flacfile.cpp
index 679f8f001..d248d49ba 100644
--- a/3rdparty/taglib/flac/flacfile.cpp
+++ b/3rdparty/taglib/flac/flacfile.cpp
@@ -41,7 +41,7 @@
#include "flacmetadatablock.h"
#include "flacunknownmetadatablock.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -112,7 +112,7 @@ bool FLAC::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -121,7 +121,7 @@ FLAC::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate(frameFactory))
{
if(isOpen())
@@ -130,7 +130,7 @@ FLAC::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
FLAC::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
bool readProperties, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate(frameFactory))
{
if(isOpen())
@@ -142,7 +142,7 @@ FLAC::File::~File()
delete d;
}
-TagLib::Tag *FLAC::File::tag() const
+Strawberry_TagLib::TagLib::Tag *FLAC::File::tag() const
{
return &d->tag;
}
diff --git a/3rdparty/taglib/flac/flacfile.h b/3rdparty/taglib/flac/flacfile.h
index 645090e0e..6edd6dd26 100644
--- a/3rdparty/taglib/flac/flacfile.h
+++ b/3rdparty/taglib/flac/flacfile.h
@@ -34,7 +34,7 @@
#include "flacpicture.h"
#include "flacproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class Tag;
namespace ID3v2 { class FrameFactory; class Tag; }
@@ -54,16 +54,16 @@ namespace TagLib {
namespace FLAC {
- //! An implementation of TagLib::File with FLAC specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with FLAC specific methods
/*!
* This implements and provides an interface for FLAC 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 FLAC files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
@@ -139,7 +139,7 @@ namespace TagLib {
* \see ID3v1Tag()
* \see XiphComment()
*/
- virtual TagLib::Tag *tag() const;
+ virtual Strawberry_TagLib::TagLib::Tag *tag() const;
/*!
* Implements the unified property interface -- export function.
diff --git a/3rdparty/taglib/flac/flacmetadatablock.cpp b/3rdparty/taglib/flac/flacmetadatablock.cpp
index 17ab05f37..aa02ebf6c 100644
--- a/3rdparty/taglib/flac/flacmetadatablock.cpp
+++ b/3rdparty/taglib/flac/flacmetadatablock.cpp
@@ -27,7 +27,7 @@
#include
#include "flacmetadatablock.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class FLAC::MetadataBlock::MetadataBlockPrivate
{
diff --git a/3rdparty/taglib/flac/flacmetadatablock.h b/3rdparty/taglib/flac/flacmetadatablock.h
index 41bca318d..28643042f 100644
--- a/3rdparty/taglib/flac/flacmetadatablock.h
+++ b/3rdparty/taglib/flac/flacmetadatablock.h
@@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace FLAC {
diff --git a/3rdparty/taglib/flac/flacpicture.cpp b/3rdparty/taglib/flac/flacpicture.cpp
index ec07ad140..1ca86e3a7 100644
--- a/3rdparty/taglib/flac/flacpicture.cpp
+++ b/3rdparty/taglib/flac/flacpicture.cpp
@@ -27,7 +27,7 @@
#include
#include "flacpicture.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class FLAC::Picture::PicturePrivate
{
diff --git a/3rdparty/taglib/flac/flacpicture.h b/3rdparty/taglib/flac/flacpicture.h
index b6def57a7..b6faefe3b 100644
--- a/3rdparty/taglib/flac/flacpicture.h
+++ b/3rdparty/taglib/flac/flacpicture.h
@@ -32,7 +32,7 @@
#include "taglib_export.h"
#include "flacmetadatablock.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace FLAC {
diff --git a/3rdparty/taglib/flac/flacproperties.cpp b/3rdparty/taglib/flac/flacproperties.cpp
index b947f039b..1656c0d87 100644
--- a/3rdparty/taglib/flac/flacproperties.cpp
+++ b/3rdparty/taglib/flac/flacproperties.cpp
@@ -29,7 +29,7 @@
#include "flacproperties.h"
#include "flacfile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class FLAC::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/flac/flacproperties.h b/3rdparty/taglib/flac/flacproperties.h
index 6f13ce622..966d480a6 100644
--- a/3rdparty/taglib/flac/flacproperties.h
+++ b/3rdparty/taglib/flac/flacproperties.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace FLAC {
diff --git a/3rdparty/taglib/flac/flacunknownmetadatablock.cpp b/3rdparty/taglib/flac/flacunknownmetadatablock.cpp
index f9cf6e658..4aa257337 100644
--- a/3rdparty/taglib/flac/flacunknownmetadatablock.cpp
+++ b/3rdparty/taglib/flac/flacunknownmetadatablock.cpp
@@ -28,7 +28,7 @@
#include
#include "flacunknownmetadatablock.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
{
diff --git a/3rdparty/taglib/flac/flacunknownmetadatablock.h b/3rdparty/taglib/flac/flacunknownmetadatablock.h
index 3030254e3..b5c70eca2 100644
--- a/3rdparty/taglib/flac/flacunknownmetadatablock.h
+++ b/3rdparty/taglib/flac/flacunknownmetadatablock.h
@@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "flacmetadatablock.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace FLAC {
diff --git a/3rdparty/taglib/it/itfile.cpp b/3rdparty/taglib/it/itfile.cpp
index 46070a205..e1bf0c3ab 100644
--- a/3rdparty/taglib/it/itfile.cpp
+++ b/3rdparty/taglib/it/itfile.cpp
@@ -30,7 +30,7 @@
#include "modfileprivate.h"
#include "tpropertymap.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace IT;
class IT::File::FilePrivate
diff --git a/3rdparty/taglib/it/itfile.h b/3rdparty/taglib/it/itfile.h
index 19327dc65..9954f8ac2 100644
--- a/3rdparty/taglib/it/itfile.h
+++ b/3rdparty/taglib/it/itfile.h
@@ -29,7 +29,7 @@
#include "modtag.h"
#include "itproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace IT {
diff --git a/3rdparty/taglib/it/itproperties.cpp b/3rdparty/taglib/it/itproperties.cpp
index c317b660e..99687c919 100644
--- a/3rdparty/taglib/it/itproperties.cpp
+++ b/3rdparty/taglib/it/itproperties.cpp
@@ -26,7 +26,7 @@
#include "itproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace IT;
class IT::Properties::PropertiesPrivate
diff --git a/3rdparty/taglib/it/itproperties.h b/3rdparty/taglib/it/itproperties.h
index be1c9d264..4b0fb79e1 100644
--- a/3rdparty/taglib/it/itproperties.h
+++ b/3rdparty/taglib/it/itproperties.h
@@ -29,7 +29,7 @@
#include "taglib.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace IT {
class TAGLIB_EXPORT Properties : public AudioProperties {
friend class File;
diff --git a/3rdparty/taglib/mod/modfile.cpp b/3rdparty/taglib/mod/modfile.cpp
index 2bfe184d6..a9499209a 100644
--- a/3rdparty/taglib/mod/modfile.cpp
+++ b/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
diff --git a/3rdparty/taglib/mod/modfile.h b/3rdparty/taglib/mod/modfile.h
index b66452d79..b66dcdf59 100644
--- a/3rdparty/taglib/mod/modfile.h
+++ b/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:
/*!
diff --git a/3rdparty/taglib/mod/modfilebase.cpp b/3rdparty/taglib/mod/modfilebase.cpp
index 142f669ff..f53ea5ee2 100644
--- a/3rdparty/taglib/mod/modfilebase.cpp
+++ b/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)
{
}
diff --git a/3rdparty/taglib/mod/modfilebase.h b/3rdparty/taglib/mod/modfilebase.h
index bae97167c..7f0607c6d 100644
--- a/3rdparty/taglib/mod/modfilebase.h
+++ b/3rdparty/taglib/mod/modfilebase.h
@@ -34,11 +34,11 @@
#include
-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);
diff --git a/3rdparty/taglib/mod/modproperties.cpp b/3rdparty/taglib/mod/modproperties.cpp
index c6bf39475..756d91275 100644
--- a/3rdparty/taglib/mod/modproperties.cpp
+++ b/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
diff --git a/3rdparty/taglib/mod/modproperties.h b/3rdparty/taglib/mod/modproperties.h
index 471229431..188eab219 100644
--- a/3rdparty/taglib/mod/modproperties.h
+++ b/3rdparty/taglib/mod/modproperties.h
@@ -29,7 +29,7 @@
#include "taglib.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Mod {
diff --git a/3rdparty/taglib/mod/modtag.cpp b/3rdparty/taglib/mod/modtag.cpp
index 0e8d03719..320cabcbf 100644
--- a/3rdparty/taglib/mod/modtag.cpp
+++ b/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())
{
}
diff --git a/3rdparty/taglib/mod/modtag.h b/3rdparty/taglib/mod/modtag.h
index dee066171..d72ebbe3e 100644
--- a/3rdparty/taglib/mod/modtag.h
+++ b/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();
diff --git a/3rdparty/taglib/mp4/mp4atom.cpp b/3rdparty/taglib/mp4/mp4atom.cpp
index 106af7eb5..4e2f28e0e 100644
--- a/3rdparty/taglib/mp4/mp4atom.cpp
+++ b/3rdparty/taglib/mp4/mp4atom.cpp
@@ -29,7 +29,7 @@
#include
#include "mp4atom.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
const char *MP4::Atom::containers[11] = {
"moov", "udta", "mdia", "meta", "ilst",
diff --git a/3rdparty/taglib/mp4/mp4atom.h b/3rdparty/taglib/mp4/mp4atom.h
index cbb0d10ad..e0b62b19e 100644
--- a/3rdparty/taglib/mp4/mp4atom.h
+++ b/3rdparty/taglib/mp4/mp4atom.h
@@ -33,12 +33,12 @@
#include "tfile.h"
#include "tlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MP4 {
class Atom;
- typedef TagLib::List AtomList;
+ typedef Strawberry_TagLib::TagLib::List AtomList;
enum AtomDataType
{
@@ -72,7 +72,7 @@ namespace TagLib {
ByteVector data;
};
- typedef TagLib::List AtomDataList;
+ typedef Strawberry_TagLib::TagLib::List AtomDataList;
class Atom
{
@@ -84,7 +84,7 @@ namespace TagLib {
AtomList findall(const char *name, bool recursive = false);
long offset;
long length;
- TagLib::ByteVector name;
+ Strawberry_TagLib::TagLib::ByteVector name;
AtomList children;
private:
static const int numContainers = 11;
diff --git a/3rdparty/taglib/mp4/mp4coverart.cpp b/3rdparty/taglib/mp4/mp4coverart.cpp
index 69c9e685e..48adce851 100644
--- a/3rdparty/taglib/mp4/mp4coverart.cpp
+++ b/3rdparty/taglib/mp4/mp4coverart.cpp
@@ -28,7 +28,7 @@
#include "trefcounter.h"
#include "mp4coverart.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MP4::CoverArt::CoverArtPrivate : public RefCounter
{
diff --git a/3rdparty/taglib/mp4/mp4coverart.h b/3rdparty/taglib/mp4/mp4coverart.h
index ebfb3f949..116fa9034 100644
--- a/3rdparty/taglib/mp4/mp4coverart.h
+++ b/3rdparty/taglib/mp4/mp4coverart.h
@@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "mp4atom.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MP4 {
diff --git a/3rdparty/taglib/mp4/mp4file.cpp b/3rdparty/taglib/mp4/mp4file.cpp
index 5ad8396de..691e52ead 100644
--- a/3rdparty/taglib/mp4/mp4file.cpp
+++ b/3rdparty/taglib/mp4/mp4file.cpp
@@ -32,7 +32,7 @@
#include "mp4tag.h"
#include "mp4file.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -88,7 +88,7 @@ bool MP4::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -96,7 +96,7 @@ MP4::File::File(FileName file, bool readProperties, AudioProperties::ReadStyle)
}
MP4::File::File(IOStream *stream, bool readProperties, AudioProperties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
diff --git a/3rdparty/taglib/mp4/mp4file.h b/3rdparty/taglib/mp4/mp4file.h
index 8a46d17df..7076e0f15 100644
--- a/3rdparty/taglib/mp4/mp4file.h
+++ b/3rdparty/taglib/mp4/mp4file.h
@@ -32,7 +32,7 @@
#include "mp4properties.h"
#include "mp4tag.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! An implementation of MP4 (AAC, ALAC, ...) metadata
namespace MP4 {
@@ -41,11 +41,11 @@ namespace TagLib {
/*!
* This implements and provides an interface for MP4 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 MP4 files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
@@ -78,7 +78,7 @@ namespace TagLib {
* Returns a pointer to the MP4 tag of the file.
*
* MP4::Tag implements the tag interface, so this serves as the
- * reimplementation of TagLib::File::tag().
+ * reimplementation of Strawberry_TagLib::TagLib::File::tag().
*
* \note The Tag is still owned by the MP4::File and should not be
* deleted by the user. It will be deleted when the file (object) is
diff --git a/3rdparty/taglib/mp4/mp4item.cpp b/3rdparty/taglib/mp4/mp4item.cpp
index 787ed457c..287780424 100644
--- a/3rdparty/taglib/mp4/mp4item.cpp
+++ b/3rdparty/taglib/mp4/mp4item.cpp
@@ -28,7 +28,7 @@
#include "trefcounter.h"
#include "mp4item.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MP4::Item::ItemPrivate : public RefCounter
{
diff --git a/3rdparty/taglib/mp4/mp4item.h b/3rdparty/taglib/mp4/mp4item.h
index 3821135bd..cfaab379f 100644
--- a/3rdparty/taglib/mp4/mp4item.h
+++ b/3rdparty/taglib/mp4/mp4item.h
@@ -30,7 +30,7 @@
#include "mp4coverart.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MP4 {
diff --git a/3rdparty/taglib/mp4/mp4properties.cpp b/3rdparty/taglib/mp4/mp4properties.cpp
index faa43c270..ad1de269c 100644
--- a/3rdparty/taglib/mp4/mp4properties.cpp
+++ b/3rdparty/taglib/mp4/mp4properties.cpp
@@ -29,7 +29,7 @@
#include "mp4atom.h"
#include "mp4properties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MP4::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/mp4/mp4properties.h b/3rdparty/taglib/mp4/mp4properties.h
index 410d53482..c3b8ac979 100644
--- a/3rdparty/taglib/mp4/mp4properties.h
+++ b/3rdparty/taglib/mp4/mp4properties.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MP4 {
diff --git a/3rdparty/taglib/mp4/mp4tag.cpp b/3rdparty/taglib/mp4/mp4tag.cpp
index a3636a9d6..d130f6222 100644
--- a/3rdparty/taglib/mp4/mp4tag.cpp
+++ b/3rdparty/taglib/mp4/mp4tag.cpp
@@ -30,7 +30,7 @@
#include "mp4tag.h"
#include "id3v1genres.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MP4::Tag::TagPrivate
{
@@ -39,7 +39,7 @@ public:
file(0),
atoms(0) {}
- TagLib::File *file;
+ Strawberry_TagLib::TagLib::File *file;
Atoms *atoms;
ItemMap items;
};
@@ -49,7 +49,7 @@ MP4::Tag::Tag() :
{
}
-MP4::Tag::Tag(TagLib::File *file, MP4::Atoms *atoms) :
+MP4::Tag::Tag(Strawberry_TagLib::TagLib::File *file, MP4::Atoms *atoms) :
d(new TagPrivate())
{
d->file = file;
diff --git a/3rdparty/taglib/mp4/mp4tag.h b/3rdparty/taglib/mp4/mp4tag.h
index d477a86ee..0697e7a01 100644
--- a/3rdparty/taglib/mp4/mp4tag.h
+++ b/3rdparty/taglib/mp4/mp4tag.h
@@ -35,21 +35,21 @@
#include "mp4atom.h"
#include "mp4item.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MP4 {
/*!
* \deprecated
*/
- typedef TagLib::Map ItemListMap;
- typedef TagLib::Map ItemMap;
+ typedef Strawberry_TagLib::TagLib::Map ItemListMap;
+ typedef Strawberry_TagLib::TagLib::Map ItemMap;
- class TAGLIB_EXPORT Tag: public TagLib::Tag
+ class TAGLIB_EXPORT Tag: public Strawberry_TagLib::TagLib::Tag
{
public:
Tag();
- Tag(TagLib::File *file, Atoms *atoms);
+ Tag(Strawberry_TagLib::TagLib::File *file, Atoms *atoms);
virtual ~Tag();
bool save();
diff --git a/3rdparty/taglib/mpc/mpcfile.cpp b/3rdparty/taglib/mpc/mpcfile.cpp
index 0ffaf8933..fa82427e6 100644
--- a/3rdparty/taglib/mpc/mpcfile.cpp
+++ b/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;
}
diff --git a/3rdparty/taglib/mpc/mpcfile.h b/3rdparty/taglib/mpc/mpcfile.h
index 89a866e3b..c82e1f1b2 100644
--- a/3rdparty/taglib/mpc/mpcfile.h
+++ b/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.
diff --git a/3rdparty/taglib/mpc/mpcproperties.cpp b/3rdparty/taglib/mpc/mpcproperties.cpp
index b9fbbf137..aa1818940 100644
--- a/3rdparty/taglib/mpc/mpcproperties.cpp
+++ b/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
{
diff --git a/3rdparty/taglib/mpc/mpcproperties.h b/3rdparty/taglib/mpc/mpcproperties.h
index d5fdfbb98..c366101f3 100644
--- a/3rdparty/taglib/mpc/mpcproperties.h
+++ b/3rdparty/taglib/mpc/mpcproperties.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MPC {
diff --git a/3rdparty/taglib/mpeg/id3v1/id3v1genres.cpp b/3rdparty/taglib/mpeg/id3v1/id3v1genres.cpp
index 1c707c30c..852757970 100644
--- a/3rdparty/taglib/mpeg/id3v1/id3v1genres.cpp
+++ b/3rdparty/taglib/mpeg/id3v1/id3v1genres.cpp
@@ -25,7 +25,7 @@
#include "id3v1genres.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
diff --git a/3rdparty/taglib/mpeg/id3v1/id3v1genres.h b/3rdparty/taglib/mpeg/id3v1/id3v1genres.h
index 0a0dd9700..33259dae2 100644
--- a/3rdparty/taglib/mpeg/id3v1/id3v1genres.h
+++ b/3rdparty/taglib/mpeg/id3v1/id3v1genres.h
@@ -30,7 +30,7 @@
#include "tstringlist.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v1 {
typedef Map GenreMap;
diff --git a/3rdparty/taglib/mpeg/id3v1/id3v1tag.cpp b/3rdparty/taglib/mpeg/id3v1/id3v1tag.cpp
index ca9304113..894f2124f 100644
--- a/3rdparty/taglib/mpeg/id3v1/id3v1tag.cpp
+++ b/3rdparty/taglib/mpeg/id3v1/id3v1tag.cpp
@@ -29,7 +29,7 @@
#include "id3v1tag.h"
#include "id3v1genres.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v1;
namespace
@@ -85,13 +85,13 @@ ByteVector ID3v1::StringHandler::render(const String &s) const
////////////////////////////////////////////////////////////////////////////////
ID3v1::Tag::Tag() :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
}
ID3v1::Tag::Tag(File *file, long tagOffset) :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
d->file = file;
diff --git a/3rdparty/taglib/mpeg/id3v1/id3v1tag.h b/3rdparty/taglib/mpeg/id3v1/id3v1tag.h
index b61f06af9..25e296a44 100644
--- a/3rdparty/taglib/mpeg/id3v1/id3v1tag.h
+++ b/3rdparty/taglib/mpeg/id3v1/id3v1tag.h
@@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class File;
@@ -88,7 +88,7 @@ namespace TagLib {
* This is an implementation of the ID3v1 format. ID3v1 is both the simplest
* and most common of tag formats but is rather limited. Because of its
* pervasiveness and the way that applications have been written around the
- * fields that it provides, the generic TagLib::Tag API is a mirror of what is
+ * fields that it provides, the generic Strawberry_TagLib::TagLib::Tag API is a mirror of what is
* provided by ID3v1.
*
* ID3v1 tags should generally only contain Latin1 information. However because
@@ -102,7 +102,7 @@ namespace TagLib {
* truncation happens automatically when the tag is rendered.
*/
- class TAGLIB_EXPORT Tag : public TagLib::Tag
+ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
{
public:
/*!
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
index 8e2630cef..4355cc766 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp
@@ -28,7 +28,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class AttachedPictureFrame::AttachedPictureFramePrivate
@@ -144,7 +144,7 @@ void AttachedPictureFrame::parseFields(const ByteVector &data)
return;
}
- d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+ d->type = (Strawberry_TagLib::TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
d->description = readStringField(data, d->textEncoding, &pos);
d->data = data.mid(pos);
@@ -205,7 +205,7 @@ void AttachedPictureFrameV22::parseFields(const ByteVector &data)
d->mimeType = "image/" + fixedString;
}
- d->type = (TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
+ d->type = (Strawberry_TagLib::TagLib::ID3v2::AttachedPictureFrame::Type)data[pos++];
d->description = readStringField(data, d->textEncoding, &pos);
d->data = data.mid(pos);
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h b/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h
index 55067bd2d..1bbab70c2 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h
@@ -30,7 +30,7 @@
#include "id3v2header.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp
index 36d2d4fa3..292312410 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp
@@ -30,7 +30,7 @@
#include "chapterframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class ChapterFrame::ChapterFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h
index 64ee19d3d..78ca551b3 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h
@@ -30,7 +30,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp
index fa7114e5d..288a307e4 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp
@@ -31,7 +31,7 @@
#include "commentsframe.h"
#include "tpropertymap.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class CommentsFrame::CommentsFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h
index 4da9d5357..f6ebfe6cf 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
index 930318123..6e0b1bc1c 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp
@@ -29,7 +29,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class EventTimingCodesFrame::EventTimingCodesFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h b/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
index 3dcedb9eb..3e605b89a 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "tlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
@@ -116,7 +116,7 @@ namespace TagLib {
/*!
* List of synchronized events.
*/
- typedef TagLib::List SynchedEventList;
+ typedef Strawberry_TagLib::TagLib::List SynchedEventList;
/*!
* Construct an empty event timing codes frame.
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
index c9b2f6dc4..cafda8971 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp
@@ -31,7 +31,7 @@
#include "generalencapsulatedobjectframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class GeneralEncapsulatedObjectFrame::GeneralEncapsulatedObjectFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h b/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
index 769dfb025..495b09771 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h
@@ -33,7 +33,7 @@
#include "id3v2header.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp
index 0b180dbf6..91795fc7f 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp
@@ -29,7 +29,7 @@
#include "ownershipframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class OwnershipFrame::OwnershipFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h b/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h
index 06a1e2336..efc62c7e3 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.cpp
index 7285b9689..359b5e743 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.cpp
@@ -25,7 +25,7 @@
#include "podcastframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class PodcastFrame::PodcastFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h b/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h
index 7bbc2138b..d846e8b1e 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
index 9106fabd5..3a5c22b5b 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp
@@ -27,7 +27,7 @@
#include "popularimeterframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class PopularimeterFrame::PopularimeterFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h b/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h
index 405ca69e8..e8eb7332b 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/privateframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/privateframe.cpp
index be80c4df8..a1c0008d3 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/privateframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/privateframe.cpp
@@ -30,7 +30,7 @@
#include "privateframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h b/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h
index 06f82f32e..a3fc8979c 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/privateframe.h
@@ -30,7 +30,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
index 3398ada82..12f36fdfc 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp
@@ -28,7 +28,7 @@
#include "relativevolumeframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
struct ChannelData
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h b/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h
index 695e26f50..1f238ac45 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h
@@ -30,7 +30,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
index 6a62bb495..6180ea466 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp
@@ -29,7 +29,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class SynchronizedLyricsFrame::SynchronizedLyricsFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
index f520c5938..7f7909175 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "tlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
@@ -93,7 +93,7 @@ namespace TagLib {
/*!
* List of synchronized lyrics.
*/
- typedef TagLib::List SynchedTextList;
+ typedef Strawberry_TagLib::TagLib::List SynchedTextList;
/*!
* Construct an empty synchronized lyrics frame that will use the text
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
index 6f2449ec5..fe4b3803b 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp
@@ -29,7 +29,7 @@
#include "tableofcontentsframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class TableOfContentsFrame::TableOfContentsFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
index 2e5401e8a..7811806e9 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.h
@@ -31,7 +31,7 @@
#include "tbytevectorlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
index d5a88bb3f..14c87f901 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.cpp
@@ -29,7 +29,7 @@
#include "tpropertymap.h"
#include "id3v1genres.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class TextIdentificationFrame::TextIdentificationFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h
index e49aa897b..fa748c5ba 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/textidentificationframe.h
@@ -32,7 +32,7 @@
#include "id3v2frame.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
index 2e360f0ec..8a4140564 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.cpp
@@ -30,7 +30,7 @@
#include "id3v2tag.h"
#include "uniquefileidentifierframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class UniqueFileIdentifierFrame::UniqueFileIdentifierFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
index decf1b0d9..0c9f47959 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/uniquefileidentifierframe.h
@@ -28,7 +28,7 @@
#include "id3v2frame.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.cpp
index edb30084a..57dfc3b58 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.cpp
@@ -25,7 +25,7 @@
#include "unknownframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class UnknownFrame::UnknownFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h b/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h
index 6559f4ed2..1243ff698 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/unknownframe.h
@@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
index 0d4bb1776..0ec0bda05 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.cpp
@@ -32,7 +32,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class UnsynchronizedLyricsFrame::UnsynchronizedLyricsFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
index dad67c7a3..26447602a 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/unsynchronizedlyricsframe.h
@@ -30,7 +30,7 @@
#include "id3v2frame.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp
index 7ddb090f0..7ecb77b23 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.cpp
@@ -32,7 +32,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class UrlLinkFrame::UrlLinkFramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h
index d9ac1093b..d0bf7c658 100644
--- a/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h
+++ b/3rdparty/taglib/mpeg/id3v2/frames/urllinkframe.h
@@ -31,7 +31,7 @@
#include "id3v2frame.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.cpp
index 86eeee280..ac27268c8 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.cpp
@@ -26,7 +26,7 @@
#include "id3v2extendedheader.h"
#include "id3v2synchdata.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class ExtendedHeader::ExtendedHeaderPrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h
index 6d9386e6b..b023c4a21 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2extendedheader.h
@@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "taglib.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2footer.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2footer.cpp
index 3622724a8..169efc8d4 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2footer.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2footer.cpp
@@ -26,7 +26,7 @@
#include "id3v2footer.h"
#include "id3v2header.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class Footer::FooterPrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2footer.h b/3rdparty/taglib/mpeg/id3v2/id3v2footer.h
index 5eb380074..746ad95c7 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2footer.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2footer.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "tbytevector.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp
index 4f88dec1f..eb78b7c62 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.cpp
@@ -41,7 +41,7 @@
#include "frames/uniquefileidentifierframe.h"
#include "frames/unknownframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class Frame::FramePrivate
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h
index a179cd424..dba2a4707 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2frame.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2frame.h
@@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class StringList;
class PropertyMap;
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp
index aaa1f21f0..9642638f5 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.cpp
@@ -48,7 +48,7 @@
#include "frames/tableofcontentsframe.h"
#include "frames/podcastframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
namespace
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h
index 33c7f67ef..98afcf1ac 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2framefactory.h
@@ -31,7 +31,7 @@
#include "id3v2frame.h"
#include "id3v2header.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2header.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2header.cpp
index da4aba0a1..8e1659ae2 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2header.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2header.cpp
@@ -33,7 +33,7 @@
#include "id3v2footer.h"
#include "id3v2synchdata.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class Header::HeaderPrivate
@@ -207,14 +207,14 @@ void Header::parse(const ByteVector &data)
if(sizeData.size() != 4) {
d->tagSize = 0;
- debug("TagLib::ID3v2::Header::parse() - The tag size as read was 0 bytes!");
+ debug("Strawberry_TagLib::TagLib::ID3v2::Header::parse() - The tag size as read was 0 bytes!");
return;
}
for(ByteVector::ConstIterator it = sizeData.begin(); it != sizeData.end(); it++) {
if(static_cast(*it) >= 128) {
d->tagSize = 0;
- debug("TagLib::ID3v2::Header::parse() - One of the size bytes in the id3v2 header was greater than the allowed 128.");
+ debug("Strawberry_TagLib::TagLib::ID3v2::Header::parse() - One of the size bytes in the id3v2 header was greater than the allowed 128.");
return;
}
}
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2header.h b/3rdparty/taglib/mpeg/id3v2/id3v2header.h
index 12fb6d021..877c2219a 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2header.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2header.h
@@ -29,7 +29,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.cpp
index 2aa999993..10e0e38f1 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.cpp
@@ -27,7 +27,7 @@
#include "id3v2synchdata.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
unsigned int SynchData::toUInt(const ByteVector &data)
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h b/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h
index 13e07161b..e0bd4f265 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2synchdata.h
@@ -29,7 +29,7 @@
#include "tbytevector.h"
#include "taglib.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2tag.cpp b/3rdparty/taglib/mpeg/id3v2/id3v2tag.cpp
index 525e88b63..78e21d56d 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2tag.cpp
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2tag.cpp
@@ -44,7 +44,7 @@
#include "frames/unsynchronizedlyricsframe.h"
#include "frames/unknownframe.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
namespace
@@ -110,14 +110,14 @@ String Latin1StringHandler::parse(const ByteVector &data) const
////////////////////////////////////////////////////////////////////////////////
ID3v2::Tag::Tag() :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
d->factory = FrameFactory::instance();
}
ID3v2::Tag::Tag(File *file, long tagOffset, const FrameFactory *factory) :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
d->factory = factory;
diff --git a/3rdparty/taglib/mpeg/id3v2/id3v2tag.h b/3rdparty/taglib/mpeg/id3v2/id3v2tag.h
index 4367181fa..81084dfba 100644
--- a/3rdparty/taglib/mpeg/id3v2/id3v2tag.h
+++ b/3rdparty/taglib/mpeg/id3v2/id3v2tag.h
@@ -35,7 +35,7 @@
#include "id3v2framefactory.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class File;
@@ -125,14 +125,14 @@ namespace TagLib {
* heart and should not be done without much meditation on the spec. It's
* rather long, but if you're planning on messing with this class and others
* that deal with the details of ID3v2 (rather than the nice, safe, abstract
- * TagLib::Tag and friends), it's worth your time to familiarize yourself
+ * Strawberry_TagLib::TagLib::Tag and friends), it's worth your time to familiarize yourself
* with said spec (which is distributed with the TagLib sources). TagLib
* tries to do most of the work, but with a little luck, you can still
* convince it to generate invalid ID3v2 tags. The APIs for ID3v2 assume a
* working knowledge of ID3v2 structure. You're been warned.
*/
- class TAGLIB_EXPORT Tag : public TagLib::Tag
+ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
{
public:
/*!
@@ -216,7 +216,7 @@ namespace TagLib {
* beats per minute -- the TBPM frame.
*
* \code
- * TagLib::MPEG::File f("foo.mp3");
+ * Strawberry_TagLib::TagLib::MPEG::File f("foo.mp3");
*
* // Check to make sure that it has an ID3v2 tag
*
@@ -224,7 +224,7 @@ namespace TagLib {
*
* // Get the list of frames for a specific frame type
*
- * TagLib::ID3v2::FrameList l = f.ID3v2Tag()->frameListMap()["TBPM"];
+ * Strawberry_TagLib::TagLib::ID3v2::FrameList l = f.ID3v2Tag()->frameListMap()["TBPM"];
*
* if(!l.isEmpty())
* std::cout << l.front()->toString() << std::endl;
diff --git a/3rdparty/taglib/mpeg/mpegfile.cpp b/3rdparty/taglib/mpeg/mpegfile.cpp
index dd695e18f..75993b5b4 100644
--- a/3rdparty/taglib/mpeg/mpegfile.cpp
+++ b/3rdparty/taglib/mpeg/mpegfile.cpp
@@ -37,7 +37,7 @@
#include "mpegutils.h"
#include "tpropertymap.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -84,7 +84,7 @@ namespace
{
// Dummy file class to make a stream work with MPEG::Header.
- class AdapterFile : public TagLib::File
+ class AdapterFile : public Strawberry_TagLib::TagLib::File
{
public:
explicit AdapterFile(IOStream *stream) : File(stream) {}
@@ -133,7 +133,7 @@ bool MPEG::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
MPEG::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -142,7 +142,7 @@ MPEG::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
MPEG::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate(frameFactory))
{
if(isOpen())
@@ -151,7 +151,7 @@ MPEG::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
MPEG::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
bool readProperties, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate(frameFactory))
{
if(isOpen())
@@ -163,7 +163,7 @@ MPEG::File::~File()
delete d;
}
-TagLib::Tag *MPEG::File::tag() const
+Strawberry_TagLib::TagLib::Tag *MPEG::File::tag() const
{
return &d->tag;
}
diff --git a/3rdparty/taglib/mpeg/mpegfile.h b/3rdparty/taglib/mpeg/mpegfile.h
index 2d2dff002..ebf06bf01 100644
--- a/3rdparty/taglib/mpeg/mpegfile.h
+++ b/3rdparty/taglib/mpeg/mpegfile.h
@@ -32,25 +32,25 @@
#include "mpegproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace ID3v2 { class Tag; class FrameFactory; }
namespace ID3v1 { class Tag; }
namespace APE { class Tag; }
- //! An implementation of TagLib::File with MPEG (MP3) specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with MPEG (MP3) specific methods
namespace MPEG {
//! An MPEG file class with some useful methods specific to MPEG
/*!
- * This implements the generic TagLib::File API and additionally provides
+ * This implements the generic Strawberry_TagLib::TagLib::File API and additionally provides
* access to properties that are distinct to MPEG files, notably access
* to the different ID3 tags.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
diff --git a/3rdparty/taglib/mpeg/mpegheader.cpp b/3rdparty/taglib/mpeg/mpegheader.cpp
index 5a5015d61..29be60255 100644
--- a/3rdparty/taglib/mpeg/mpegheader.cpp
+++ b/3rdparty/taglib/mpeg/mpegheader.cpp
@@ -32,7 +32,7 @@
#include "mpegheader.h"
#include "mpegutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MPEG::Header::HeaderPrivate : public RefCounter
{
diff --git a/3rdparty/taglib/mpeg/mpegheader.h b/3rdparty/taglib/mpeg/mpegheader.h
index 024aa112e..ba5477e32 100644
--- a/3rdparty/taglib/mpeg/mpegheader.h
+++ b/3rdparty/taglib/mpeg/mpegheader.h
@@ -28,7 +28,7 @@
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class ByteVector;
class File;
diff --git a/3rdparty/taglib/mpeg/mpegproperties.cpp b/3rdparty/taglib/mpeg/mpegproperties.cpp
index d8b7bd506..933fa0953 100644
--- a/3rdparty/taglib/mpeg/mpegproperties.cpp
+++ b/3rdparty/taglib/mpeg/mpegproperties.cpp
@@ -32,7 +32,7 @@
#include "apetag.h"
#include "apefooter.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MPEG::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/mpeg/mpegproperties.h b/3rdparty/taglib/mpeg/mpegproperties.h
index f11fad112..233368417 100644
--- a/3rdparty/taglib/mpeg/mpegproperties.h
+++ b/3rdparty/taglib/mpeg/mpegproperties.h
@@ -31,7 +31,7 @@
#include "mpegheader.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace MPEG {
diff --git a/3rdparty/taglib/mpeg/mpegutils.h b/3rdparty/taglib/mpeg/mpegutils.h
index 31b45a43b..ae9a4e5ea 100644
--- a/3rdparty/taglib/mpeg/mpegutils.h
+++ b/3rdparty/taglib/mpeg/mpegutils.h
@@ -30,7 +30,7 @@
#ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
namespace MPEG
{
diff --git a/3rdparty/taglib/mpeg/xingheader.cpp b/3rdparty/taglib/mpeg/xingheader.cpp
index 6c2b25dc5..fc794025d 100644
--- a/3rdparty/taglib/mpeg/xingheader.cpp
+++ b/3rdparty/taglib/mpeg/xingheader.cpp
@@ -30,7 +30,7 @@
#include "xingheader.h"
#include "mpegfile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class MPEG::XingHeader::XingHeaderPrivate
{
@@ -81,8 +81,8 @@ MPEG::XingHeader::HeaderType MPEG::XingHeader::type() const
return d->type;
}
-int MPEG::XingHeader::xingHeaderOffset(TagLib::MPEG::Header::Version /*v*/,
- TagLib::MPEG::Header::ChannelMode /*c*/)
+int MPEG::XingHeader::xingHeaderOffset(Strawberry_TagLib::TagLib::MPEG::Header::Version /*v*/,
+ Strawberry_TagLib::TagLib::MPEG::Header::ChannelMode /*c*/)
{
return 0;
}
diff --git a/3rdparty/taglib/mpeg/xingheader.h b/3rdparty/taglib/mpeg/xingheader.h
index f512e2340..63d39db3a 100644
--- a/3rdparty/taglib/mpeg/xingheader.h
+++ b/3rdparty/taglib/mpeg/xingheader.h
@@ -29,7 +29,7 @@
#include "mpegheader.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class ByteVector;
@@ -111,8 +111,8 @@ namespace TagLib {
*
* \deprecated Always returns 0.
*/
- static int xingHeaderOffset(TagLib::MPEG::Header::Version v,
- TagLib::MPEG::Header::ChannelMode c);
+ static int xingHeaderOffset(Strawberry_TagLib::TagLib::MPEG::Header::Version v,
+ Strawberry_TagLib::TagLib::MPEG::Header::ChannelMode c);
private:
XingHeader(const XingHeader &);
diff --git a/3rdparty/taglib/ogg/flac/oggflacfile.cpp b/3rdparty/taglib/ogg/flac/oggflacfile.cpp
index 07ea9dccc..b0387e819 100644
--- a/3rdparty/taglib/ogg/flac/oggflacfile.cpp
+++ b/3rdparty/taglib/ogg/flac/oggflacfile.cpp
@@ -32,8 +32,8 @@
#include
#include "oggflacfile.h"
-using namespace TagLib;
-using TagLib::FLAC::Properties;
+using namespace Strawberry_TagLib::TagLib;
+using Strawberry_TagLib::TagLib::FLAC::Properties;
class Ogg::FLAC::File::FilePrivate
{
diff --git a/3rdparty/taglib/ogg/flac/oggflacfile.h b/3rdparty/taglib/ogg/flac/oggflacfile.h
index b2686e457..8e9ecf1f7 100644
--- a/3rdparty/taglib/ogg/flac/oggflacfile.h
+++ b/3rdparty/taglib/ogg/flac/oggflacfile.h
@@ -32,7 +32,7 @@
#include "flacproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class Tag;
@@ -49,14 +49,14 @@ namespace TagLib {
*/
namespace FLAC {
- using TagLib::FLAC::Properties;
+ using Strawberry_TagLib::TagLib::FLAC::Properties;
- //! An implementation of TagLib::File with Ogg/FLAC specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with Ogg/FLAC specific methods
/*!
* This implements and provides an interface for Ogg/FLAC 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 Ogg FLAC files.
*/
@@ -165,6 +165,6 @@ namespace TagLib {
};
} // namespace FLAC
} // namespace Ogg
-} // namespace TagLib
+} // namespace Strawberry_TagLib::TagLib
#endif
diff --git a/3rdparty/taglib/ogg/oggfile.cpp b/3rdparty/taglib/ogg/oggfile.cpp
index aa309ccd2..ef08e8b06 100644
--- a/3rdparty/taglib/ogg/oggfile.cpp
+++ b/3rdparty/taglib/ogg/oggfile.cpp
@@ -32,7 +32,7 @@
#include "oggpage.h"
#include "oggpageheader.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -175,13 +175,13 @@ bool Ogg::File::save()
////////////////////////////////////////////////////////////////////////////////
Ogg::File::File(FileName file) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
}
Ogg::File::File(IOStream *stream) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
}
diff --git a/3rdparty/taglib/ogg/oggfile.h b/3rdparty/taglib/ogg/oggfile.h
index 7d889c2f2..b6ad53a31 100644
--- a/3rdparty/taglib/ogg/oggfile.h
+++ b/3rdparty/taglib/ogg/oggfile.h
@@ -30,7 +30,7 @@
#ifndef TAGLIB_OGGFILE_H
#define TAGLIB_OGGFILE_H
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A namespace for the classes used by Ogg-based metadata files
@@ -38,7 +38,7 @@ namespace TagLib {
class PageHeader;
- //! An implementation of TagLib::File with some helpers for Ogg based formats
+ //! An implementation of Strawberry_TagLib::TagLib::File with some helpers for Ogg based formats
/*!
* This is an implementation of Ogg file page and packet rendering and is of
@@ -47,7 +47,7 @@ namespace TagLib {
* these available (via subclassing) to the codec meta data implementations.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
virtual ~File();
diff --git a/3rdparty/taglib/ogg/oggpage.cpp b/3rdparty/taglib/ogg/oggpage.cpp
index fa8b6dcb4..e2937bceb 100644
--- a/3rdparty/taglib/ogg/oggpage.cpp
+++ b/3rdparty/taglib/ogg/oggpage.cpp
@@ -32,7 +32,7 @@
#include "oggpageheader.h"
#include "oggfile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class Ogg::Page::PagePrivate
{
diff --git a/3rdparty/taglib/ogg/oggpage.h b/3rdparty/taglib/ogg/oggpage.h
index 13e3e7f98..af0f6c659 100644
--- a/3rdparty/taglib/ogg/oggpage.h
+++ b/3rdparty/taglib/ogg/oggpage.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "tbytevectorlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
diff --git a/3rdparty/taglib/ogg/oggpageheader.cpp b/3rdparty/taglib/ogg/oggpageheader.cpp
index b867567cb..e49106cef 100644
--- a/3rdparty/taglib/ogg/oggpageheader.cpp
+++ b/3rdparty/taglib/ogg/oggpageheader.cpp
@@ -32,7 +32,7 @@
#include "oggpageheader.h"
#include "oggfile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class Ogg::PageHeader::PageHeaderPrivate
{
diff --git a/3rdparty/taglib/ogg/oggpageheader.h b/3rdparty/taglib/ogg/oggpageheader.h
index 42f673075..e5942031b 100644
--- a/3rdparty/taglib/ogg/oggpageheader.h
+++ b/3rdparty/taglib/ogg/oggpageheader.h
@@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
diff --git a/3rdparty/taglib/ogg/opus/opusfile.cpp b/3rdparty/taglib/ogg/opus/opusfile.cpp
index d4f191ad1..a37b782fe 100644
--- a/3rdparty/taglib/ogg/opus/opusfile.cpp
+++ b/3rdparty/taglib/ogg/opus/opusfile.cpp
@@ -34,8 +34,8 @@
#include "opusfile.h"
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
class Opus::File::FilePrivate
{
diff --git a/3rdparty/taglib/ogg/opus/opusfile.h b/3rdparty/taglib/ogg/opus/opusfile.h
index 0e094eae8..622c43c82 100644
--- a/3rdparty/taglib/ogg/opus/opusfile.h
+++ b/3rdparty/taglib/ogg/opus/opusfile.h
@@ -35,7 +35,7 @@
#include "opusproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
@@ -84,7 +84,7 @@ namespace TagLib {
/*!
* Returns the XiphComment for this file. XiphComment implements the tag
* interface, so this serves as the reimplementation of
- * TagLib::File::tag().
+ * Strawberry_TagLib::TagLib::File::tag().
*/
virtual Ogg::XiphComment *tag() const;
diff --git a/3rdparty/taglib/ogg/opus/opusproperties.cpp b/3rdparty/taglib/ogg/opus/opusproperties.cpp
index 537ba1669..0d7cfa78e 100644
--- a/3rdparty/taglib/ogg/opus/opusproperties.cpp
+++ b/3rdparty/taglib/ogg/opus/opusproperties.cpp
@@ -35,8 +35,8 @@
#include "opusproperties.h"
#include "opusfile.h"
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
class Opus::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/ogg/opus/opusproperties.h b/3rdparty/taglib/ogg/opus/opusproperties.h
index be88b1461..cc0b899fc 100644
--- a/3rdparty/taglib/ogg/opus/opusproperties.h
+++ b/3rdparty/taglib/ogg/opus/opusproperties.h
@@ -32,7 +32,7 @@
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
diff --git a/3rdparty/taglib/ogg/speex/speexfile.cpp b/3rdparty/taglib/ogg/speex/speexfile.cpp
index b3c8a6362..17c7d263b 100644
--- a/3rdparty/taglib/ogg/speex/speexfile.cpp
+++ b/3rdparty/taglib/ogg/speex/speexfile.cpp
@@ -34,8 +34,8 @@
#include "speexfile.h"
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
class Speex::File::FilePrivate
{
diff --git a/3rdparty/taglib/ogg/speex/speexfile.h b/3rdparty/taglib/ogg/speex/speexfile.h
index 1be7113cb..bb61566bd 100644
--- a/3rdparty/taglib/ogg/speex/speexfile.h
+++ b/3rdparty/taglib/ogg/speex/speexfile.h
@@ -35,7 +35,7 @@
#include "speexproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
@@ -84,7 +84,7 @@ namespace TagLib {
/*!
* Returns the XiphComment for this file. XiphComment implements the tag
* interface, so this serves as the reimplementation of
- * TagLib::File::tag().
+ * Strawberry_TagLib::TagLib::File::tag().
*/
virtual Ogg::XiphComment *tag() const;
diff --git a/3rdparty/taglib/ogg/speex/speexproperties.cpp b/3rdparty/taglib/ogg/speex/speexproperties.cpp
index fbcc5a4b5..a34c043b5 100644
--- a/3rdparty/taglib/ogg/speex/speexproperties.cpp
+++ b/3rdparty/taglib/ogg/speex/speexproperties.cpp
@@ -35,8 +35,8 @@
#include "speexproperties.h"
#include "speexfile.h"
-using namespace TagLib;
-using namespace TagLib::Ogg;
+using namespace Strawberry_TagLib::TagLib;
+using namespace Strawberry_TagLib::TagLib::Ogg;
class Speex::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/ogg/speex/speexproperties.h b/3rdparty/taglib/ogg/speex/speexproperties.h
index 64e6fac37..d602385fd 100644
--- a/3rdparty/taglib/ogg/speex/speexproperties.h
+++ b/3rdparty/taglib/ogg/speex/speexproperties.h
@@ -32,7 +32,7 @@
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp b/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp
index b4f221ab1..d63b5f79a 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp
+++ b/3rdparty/taglib/ogg/vorbis/vorbisfile.cpp
@@ -32,7 +32,7 @@
#include "vorbisfile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class Vorbis::File::FilePrivate
{
@@ -51,7 +51,7 @@ public:
Properties *properties;
};
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
/*!
* Vorbis headers can be found with one type ID byte and the string "vorbis" in
* an Ogg stream. 0x03 indicates the comment header.
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisfile.h b/3rdparty/taglib/ogg/vorbis/vorbisfile.h
index 04c0c04ea..7f6463911 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisfile.h
+++ b/3rdparty/taglib/ogg/vorbis/vorbisfile.h
@@ -32,7 +32,7 @@
#include "vorbisproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
/*
* This is just to make this appear to be in the Ogg namespace in the
@@ -91,7 +91,7 @@ namespace TagLib {
/*!
* Returns the XiphComment for this file. XiphComment implements the tag
* interface, so this serves as the reimplementation of
- * TagLib::File::tag().
+ * Strawberry_TagLib::TagLib::File::tag().
*/
virtual Ogg::XiphComment *tag() const;
@@ -149,7 +149,7 @@ namespace TagLib {
#ifdef DOXYGEN
}
#else
- namespace Ogg { namespace Vorbis { typedef TagLib::Vorbis::File File; } }
+ namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::Vorbis::File File; } }
#endif
}
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp b/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp
index 981400f04..1b2b82f57 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp
+++ b/3rdparty/taglib/ogg/vorbis/vorbisproperties.cpp
@@ -31,7 +31,7 @@
#include "vorbisproperties.h"
#include "vorbisfile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class Vorbis::Properties::PropertiesPrivate
{
@@ -56,7 +56,7 @@ public:
int bitrateMinimum;
};
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
/*!
* Vorbis headers can be found with one type ID byte and the string "vorbis" in
* an Ogg stream. 0x01 indicates the setup header.
diff --git a/3rdparty/taglib/ogg/vorbis/vorbisproperties.h b/3rdparty/taglib/ogg/vorbis/vorbisproperties.h
index 9da0ac9d7..e6c731708 100644
--- a/3rdparty/taglib/ogg/vorbis/vorbisproperties.h
+++ b/3rdparty/taglib/ogg/vorbis/vorbisproperties.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
/*
* This is just to make this appear to be in the Ogg namespace in the
@@ -152,7 +152,7 @@ namespace TagLib {
#ifdef DOXYGEN
}
#else
- namespace Ogg { namespace Vorbis { typedef TagLib::AudioProperties AudioProperties; } }
+ namespace Ogg { namespace Vorbis { typedef Strawberry_TagLib::TagLib::AudioProperties AudioProperties; } }
#endif
}
diff --git a/3rdparty/taglib/ogg/xiphcomment.cpp b/3rdparty/taglib/ogg/xiphcomment.cpp
index f56bf810c..f9ea3e620 100644
--- a/3rdparty/taglib/ogg/xiphcomment.cpp
+++ b/3rdparty/taglib/ogg/xiphcomment.cpp
@@ -30,7 +30,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -61,13 +61,13 @@ public:
////////////////////////////////////////////////////////////////////////////////
Ogg::XiphComment::XiphComment() :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new XiphCommentPrivate())
{
}
Ogg::XiphComment::XiphComment(const ByteVector &data) :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new XiphCommentPrivate())
{
parse(data);
diff --git a/3rdparty/taglib/ogg/xiphcomment.h b/3rdparty/taglib/ogg/xiphcomment.h
index 14fc5407d..c22596bd9 100644
--- a/3rdparty/taglib/ogg/xiphcomment.h
+++ b/3rdparty/taglib/ogg/xiphcomment.h
@@ -35,7 +35,7 @@
#include "flacpicture.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace Ogg {
@@ -62,7 +62,7 @@ namespace TagLib {
* \see fieldListMap()
*/
- class TAGLIB_EXPORT XiphComment : public TagLib::Tag
+ class TAGLIB_EXPORT XiphComment : public Strawberry_TagLib::TagLib::Tag
{
public:
/*!
diff --git a/3rdparty/taglib/riff/aiff/aifffile.cpp b/3rdparty/taglib/riff/aiff/aifffile.cpp
index 4f9c868e6..a49ca6c3c 100644
--- a/3rdparty/taglib/riff/aiff/aifffile.cpp
+++ b/3rdparty/taglib/riff/aiff/aifffile.cpp
@@ -32,7 +32,7 @@
#include "aifffile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class RIFF::AIFF::File::FilePrivate
{
diff --git a/3rdparty/taglib/riff/aiff/aifffile.h b/3rdparty/taglib/riff/aiff/aifffile.h
index 5ba1a2791..8195a5084 100644
--- a/3rdparty/taglib/riff/aiff/aifffile.h
+++ b/3rdparty/taglib/riff/aiff/aifffile.h
@@ -30,7 +30,7 @@
#include "id3v2tag.h"
#include "aiffproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace RIFF {
@@ -45,16 +45,16 @@ namespace TagLib {
namespace AIFF {
- //! An implementation of TagLib::File with AIFF specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with AIFF specific methods
/*!
* This implements and provides an interface for AIFF 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 AIFF files.
*/
- class TAGLIB_EXPORT File : public TagLib::RIFF::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::RIFF::File
{
public:
/*!
diff --git a/3rdparty/taglib/riff/aiff/aiffproperties.cpp b/3rdparty/taglib/riff/aiff/aiffproperties.cpp
index e1d954feb..1cbd0f2f8 100644
--- a/3rdparty/taglib/riff/aiff/aiffproperties.cpp
+++ b/3rdparty/taglib/riff/aiff/aiffproperties.cpp
@@ -28,7 +28,7 @@
#include "aifffile.h"
#include "aiffproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class RIFF::AIFF::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/riff/aiff/aiffproperties.h b/3rdparty/taglib/riff/aiff/aiffproperties.h
index d8bbaca9d..f3242997c 100644
--- a/3rdparty/taglib/riff/aiff/aiffproperties.h
+++ b/3rdparty/taglib/riff/aiff/aiffproperties.h
@@ -28,7 +28,7 @@
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace RIFF {
diff --git a/3rdparty/taglib/riff/rifffile.cpp b/3rdparty/taglib/riff/rifffile.cpp
index 78054d79e..5add8322b 100644
--- a/3rdparty/taglib/riff/rifffile.cpp
+++ b/3rdparty/taglib/riff/rifffile.cpp
@@ -33,7 +33,7 @@
#include "rifffile.h"
#include "riffutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
struct Chunk
{
@@ -73,7 +73,7 @@ RIFF::File::~File()
////////////////////////////////////////////////////////////////////////////////
RIFF::File::File(FileName file, Endianness endianness) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate(endianness))
{
if(isOpen())
@@ -81,7 +81,7 @@ RIFF::File::File(FileName file, Endianness endianness) :
}
RIFF::File::File(IOStream *stream, Endianness endianness) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate(endianness))
{
if(isOpen())
diff --git a/3rdparty/taglib/riff/rifffile.h b/3rdparty/taglib/riff/rifffile.h
index 5c606b4a7..d19966f2b 100644
--- a/3rdparty/taglib/riff/rifffile.h
+++ b/3rdparty/taglib/riff/rifffile.h
@@ -29,21 +29,21 @@
#include "taglib_export.h"
#include "tfile.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
- //! An implementation of TagLib::File with RIFF specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with RIFF specific methods
namespace RIFF {
//! An RIFF file class with some useful methods specific to RIFF
/*!
- * This implements the generic TagLib::File API and additionally provides
+ * This implements the generic Strawberry_TagLib::TagLib::File API and additionally provides
* access to properties that are distinct to RIFF files, notably access
* to the different ID3 tags.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
diff --git a/3rdparty/taglib/riff/riffutils.h b/3rdparty/taglib/riff/riffutils.h
index ecb985a4b..211a8f17c 100644
--- a/3rdparty/taglib/riff/riffutils.h
+++ b/3rdparty/taglib/riff/riffutils.h
@@ -30,7 +30,7 @@
#ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
namespace RIFF
{
diff --git a/3rdparty/taglib/riff/wav/infotag.cpp b/3rdparty/taglib/riff/wav/infotag.cpp
index df1cfbeef..761e80a2e 100644
--- a/3rdparty/taglib/riff/wav/infotag.cpp
+++ b/3rdparty/taglib/riff/wav/infotag.cpp
@@ -29,7 +29,7 @@
#include "infotag.h"
#include "riffutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace RIFF::Info;
namespace
@@ -71,14 +71,14 @@ ByteVector RIFF::Info::StringHandler::render(const String &s) const
////////////////////////////////////////////////////////////////////////////////
RIFF::Info::Tag::Tag(const ByteVector &data) :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
parse(data);
}
RIFF::Info::Tag::Tag() :
- TagLib::Tag(),
+ Strawberry_TagLib::TagLib::Tag(),
d(new TagPrivate())
{
}
diff --git a/3rdparty/taglib/riff/wav/infotag.h b/3rdparty/taglib/riff/wav/infotag.h
index d1f0297db..7f4d63239 100644
--- a/3rdparty/taglib/riff/wav/infotag.h
+++ b/3rdparty/taglib/riff/wav/infotag.h
@@ -33,7 +33,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class File;
@@ -85,7 +85,7 @@ namespace TagLib {
* documents about it. So, this implementation is referring to unofficial documents
* online and some applications' behaviors especially Windows Explorer.
*/
- class TAGLIB_EXPORT Tag : public TagLib::Tag
+ class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag
{
public:
/*!
diff --git a/3rdparty/taglib/riff/wav/wavfile.cpp b/3rdparty/taglib/riff/wav/wavfile.cpp
index 0ebe21c32..7001d90f2 100644
--- a/3rdparty/taglib/riff/wav/wavfile.cpp
+++ b/3rdparty/taglib/riff/wav/wavfile.cpp
@@ -34,7 +34,7 @@
#include "infotag.h"
#include "tagunion.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
diff --git a/3rdparty/taglib/riff/wav/wavfile.h b/3rdparty/taglib/riff/wav/wavfile.h
index f6c190ed6..d3f81fc2b 100644
--- a/3rdparty/taglib/riff/wav/wavfile.h
+++ b/3rdparty/taglib/riff/wav/wavfile.h
@@ -31,7 +31,7 @@
#include "infotag.h"
#include "wavproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace RIFF {
@@ -46,16 +46,16 @@ namespace TagLib {
namespace WAV {
- //! An implementation of TagLib::File with WAV specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with WAV specific methods
/*!
* This implements and provides an interface for WAV 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 WAV files.
*/
- class TAGLIB_EXPORT File : public TagLib::RIFF::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::RIFF::File
{
public:
enum TagTypes {
diff --git a/3rdparty/taglib/riff/wav/wavproperties.cpp b/3rdparty/taglib/riff/wav/wavproperties.cpp
index 181e3a6ca..0730b57bb 100644
--- a/3rdparty/taglib/riff/wav/wavproperties.cpp
+++ b/3rdparty/taglib/riff/wav/wavproperties.cpp
@@ -27,7 +27,7 @@
#include "wavfile.h"
#include "wavproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -78,7 +78,7 @@ RIFF::WAV::Properties::Properties(const ByteVector &, unsigned int, ReadStyle st
debug("RIFF::WAV::Properties::Properties() -- This constructor is no longer used.");
}
-TagLib::RIFF::WAV::Properties::Properties(File *file, ReadStyle style) :
+Strawberry_TagLib::TagLib::RIFF::WAV::Properties::Properties(File *file, ReadStyle style) :
AudioProperties(style),
d(new PropertiesPrivate())
{
diff --git a/3rdparty/taglib/riff/wav/wavproperties.h b/3rdparty/taglib/riff/wav/wavproperties.h
index 6716876a7..8e9fee0e3 100644
--- a/3rdparty/taglib/riff/wav/wavproperties.h
+++ b/3rdparty/taglib/riff/wav/wavproperties.h
@@ -29,7 +29,7 @@
#include "taglib.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class ByteVector;
diff --git a/3rdparty/taglib/s3m/s3mfile.cpp b/3rdparty/taglib/s3m/s3mfile.cpp
index 1270e76c6..5d938f111 100644
--- a/3rdparty/taglib/s3m/s3mfile.cpp
+++ b/3rdparty/taglib/s3m/s3mfile.cpp
@@ -32,7 +32,7 @@
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace S3M;
class S3M::File::FilePrivate
diff --git a/3rdparty/taglib/s3m/s3mfile.h b/3rdparty/taglib/s3m/s3mfile.h
index 4011bd14a..2e4be1138 100644
--- a/3rdparty/taglib/s3m/s3mfile.h
+++ b/3rdparty/taglib/s3m/s3mfile.h
@@ -33,7 +33,7 @@
#include "modtag.h"
#include "s3mproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace S3M {
diff --git a/3rdparty/taglib/s3m/s3mproperties.cpp b/3rdparty/taglib/s3m/s3mproperties.cpp
index e3e443cb8..505fb894e 100644
--- a/3rdparty/taglib/s3m/s3mproperties.cpp
+++ b/3rdparty/taglib/s3m/s3mproperties.cpp
@@ -26,7 +26,7 @@
#include "s3mproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace S3M;
class S3M::Properties::PropertiesPrivate
diff --git a/3rdparty/taglib/s3m/s3mproperties.h b/3rdparty/taglib/s3m/s3mproperties.h
index 92b2a2746..886adc21f 100644
--- a/3rdparty/taglib/s3m/s3mproperties.h
+++ b/3rdparty/taglib/s3m/s3mproperties.h
@@ -29,7 +29,7 @@
#include "taglib.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace S3M {
class TAGLIB_EXPORT Properties : public AudioProperties {
friend class File;
diff --git a/3rdparty/taglib/tag.cpp b/3rdparty/taglib/tag.cpp
index 58e7c3d7b..d88205c9a 100644
--- a/3rdparty/taglib/tag.cpp
+++ b/3rdparty/taglib/tag.cpp
@@ -27,7 +27,7 @@
#include "tstringlist.h"
#include "tpropertymap.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class Tag::TagPrivate
{
diff --git a/3rdparty/taglib/tag.h b/3rdparty/taglib/tag.h
index be9628c81..2ecf6c3b5 100644
--- a/3rdparty/taglib/tag.h
+++ b/3rdparty/taglib/tag.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "tstring.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A simple, generic interface to common audio meta data fields
@@ -38,7 +38,7 @@ namespace TagLib {
* of various audio codecs and tagging schemes. As such it is generally a
* subset of what is available in the specific formats but should be suitable
* for most applications. This is meant to compliment the generic APIs found
- * in TagLib::AudioProperties, TagLib::File and TagLib::FileRef.
+ * in Strawberry_TagLib::TagLib::AudioProperties, Strawberry_TagLib::TagLib::File and Strawberry_TagLib::TagLib::FileRef.
*/
class PropertyMap;
@@ -65,7 +65,7 @@ namespace TagLib {
* The parameter \a properties must contain only entries from
* properties().unsupportedData().
* BIC: Will become virtual in future releases. Currently the non-virtual
- * standard implementation of TagLib::Tag does nothing, since there are
+ * standard implementation of Strawberry_TagLib::TagLib::Tag does nothing, since there are
* no unsupported elements.
*/
void removeUnsupportedProperties(const StringList& properties);
diff --git a/3rdparty/taglib/tagunion.cpp b/3rdparty/taglib/tagunion.cpp
index 64d786b9a..d7f16697b 100644
--- a/3rdparty/taglib/tagunion.cpp
+++ b/3rdparty/taglib/tagunion.cpp
@@ -33,7 +33,7 @@
#include "xiphcomment.h"
#include "infotag.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
#define stringUnion(method) \
if(tag(0) && !tag(0)->method().isEmpty()) \
diff --git a/3rdparty/taglib/tagunion.h b/3rdparty/taglib/tagunion.h
index 1eb38a01d..151f19e2a 100644
--- a/3rdparty/taglib/tagunion.h
+++ b/3rdparty/taglib/tagunion.h
@@ -30,7 +30,7 @@
#ifndef DO_NOT_DOCUMENT
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
/*!
* \internal
@@ -43,7 +43,7 @@ namespace TagLib {
enum AccessType { Read, Write };
/*!
- * Creates a TagLib::Tag that is the union of \a first, \a second, and
+ * Creates a Strawberry_TagLib::TagLib::Tag that is the union of \a first, \a second, and
* \a third. The TagUnion takes ownership of these tags and will handle
* their deletion.
*/
diff --git a/3rdparty/taglib/tagutils.cpp b/3rdparty/taglib/tagutils.cpp
index d6d924064..2da9a75ee 100644
--- a/3rdparty/taglib/tagutils.cpp
+++ b/3rdparty/taglib/tagutils.cpp
@@ -31,7 +31,7 @@
#include "tagutils.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
long Utils::findID3v1(File *file)
{
@@ -78,7 +78,7 @@ long Utils::findAPE(File *file, long id3v1Location)
return -1;
}
-ByteVector TagLib::Utils::readHeader(IOStream *stream, unsigned int length,
+ByteVector Strawberry_TagLib::TagLib::Utils::readHeader(IOStream *stream, unsigned int length,
bool skipID3v2, long *headerOffset)
{
if(!stream || !stream->isOpen())
diff --git a/3rdparty/taglib/tagutils.h b/3rdparty/taglib/tagutils.h
index 4488a32ba..6dc9fc9a2 100644
--- a/3rdparty/taglib/tagutils.h
+++ b/3rdparty/taglib/tagutils.h
@@ -32,7 +32,7 @@
#include
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class File;
class IOStream;
diff --git a/3rdparty/taglib/toolkit/taglib.h b/3rdparty/taglib/toolkit/taglib.h
index 6b029974e..cebfee40d 100644
--- a/3rdparty/taglib/toolkit/taglib.h
+++ b/3rdparty/taglib/toolkit/taglib.h
@@ -52,11 +52,11 @@
* This namespace contains everything in TagLib. For projects working with
* TagLib extensively it may be convenient to add a
* \code
- * using namespace TagLib;
+ * using namespace Strawberry_TagLib::TagLib;
* \endcode
*/
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class String;
@@ -140,14 +140,14 @@ namespace TagLib {
*
* \code
*
- * TagLib::FileRef f("Latex Solar Beef.mp3");
- * TagLib::String artist = f.tag()->artist(); // artist == "Frank Zappa"
+ * Strawberry_TagLib::TagLib::FileRef f("Latex Solar Beef.mp3");
+ * Strawberry_TagLib::TagLib::String artist = f.tag()->artist(); // artist == "Frank Zappa"
*
* f.tag()->setAlbum("Fillmore East");
* f.save();
*
- * TagLib::FileRef g("Free City Rhymes.ogg");
- * TagLib::String album = g.tag()->album(); // album == "NYC Ghosts & Flowers"
+ * Strawberry_TagLib::TagLib::FileRef g("Free City Rhymes.ogg");
+ * Strawberry_TagLib::TagLib::String album = g.tag()->album(); // album == "NYC Ghosts & Flowers"
*
* g.tag()->setTrack(1);
* g.save();
diff --git a/3rdparty/taglib/toolkit/tbytevector.cpp b/3rdparty/taglib/toolkit/tbytevector.cpp
index d272057f6..3bc6fa476 100644
--- a/3rdparty/taglib/toolkit/tbytevector.cpp
+++ b/3rdparty/taglib/toolkit/tbytevector.cpp
@@ -44,7 +44,7 @@
//
// http://www.informit.com/isapi/product_id~{9C84DAB4-FE6E-49C5-BB0A-FB50331233EA}/content/index.asp
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
template
int findChar(
@@ -1036,7 +1036,7 @@ void ByteVector::detach()
// related functions
////////////////////////////////////////////////////////////////////////////////
-std::ostream &operator<<(std::ostream &s, const TagLib::ByteVector &v)
+std::ostream &operator<<(std::ostream &s, const Strawberry_TagLib::TagLib::ByteVector &v)
{
for(unsigned int i = 0; i < v.size(); i++)
s << v[i];
diff --git a/3rdparty/taglib/toolkit/tbytevector.h b/3rdparty/taglib/toolkit/tbytevector.h
index e1549bb9c..908fbcd0e 100644
--- a/3rdparty/taglib/toolkit/tbytevector.h
+++ b/3rdparty/taglib/toolkit/tbytevector.h
@@ -32,7 +32,7 @@
#include
#include
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A byte vector
@@ -627,9 +627,9 @@ namespace TagLib {
}
/*!
- * \relates TagLib::ByteVector
+ * \relates Strawberry_TagLib::TagLib::ByteVector
* Streams the ByteVector \a v to the output stream \a s.
*/
-TAGLIB_EXPORT std::ostream &operator<<(std::ostream &s, const TagLib::ByteVector &v);
+TAGLIB_EXPORT std::ostream &operator<<(std::ostream &s, const Strawberry_TagLib::TagLib::ByteVector &v);
#endif
diff --git a/3rdparty/taglib/toolkit/tbytevectorlist.cpp b/3rdparty/taglib/toolkit/tbytevectorlist.cpp
index 3ef0f61a3..92cdb509c 100644
--- a/3rdparty/taglib/toolkit/tbytevectorlist.cpp
+++ b/3rdparty/taglib/toolkit/tbytevectorlist.cpp
@@ -25,7 +25,7 @@
#include "tbytevectorlist.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ByteVectorListPrivate
{
diff --git a/3rdparty/taglib/toolkit/tbytevectorlist.h b/3rdparty/taglib/toolkit/tbytevectorlist.h
index 5852583a0..04c419b48 100644
--- a/3rdparty/taglib/toolkit/tbytevectorlist.h
+++ b/3rdparty/taglib/toolkit/tbytevectorlist.h
@@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "tlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A list of ByteVectors
diff --git a/3rdparty/taglib/toolkit/tbytevectorstream.cpp b/3rdparty/taglib/toolkit/tbytevectorstream.cpp
index dbb0986f3..389fe1bb5 100644
--- a/3rdparty/taglib/toolkit/tbytevectorstream.cpp
+++ b/3rdparty/taglib/toolkit/tbytevectorstream.cpp
@@ -32,7 +32,7 @@
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class ByteVectorStream::ByteVectorStreamPrivate
{
diff --git a/3rdparty/taglib/toolkit/tbytevectorstream.h b/3rdparty/taglib/toolkit/tbytevectorstream.h
index 84327c46d..c3948f56a 100644
--- a/3rdparty/taglib/toolkit/tbytevectorstream.h
+++ b/3rdparty/taglib/toolkit/tbytevectorstream.h
@@ -31,7 +31,7 @@
#include "tbytevector.h"
#include "tiostream.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class String;
class Tag;
diff --git a/3rdparty/taglib/toolkit/tdebug.cpp b/3rdparty/taglib/toolkit/tdebug.cpp
index b2efc4cb5..fbf00b111 100644
--- a/3rdparty/taglib/toolkit/tdebug.cpp
+++ b/3rdparty/taglib/toolkit/tdebug.cpp
@@ -38,7 +38,7 @@
#include
#include
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
// The instance is defined in tdebuglistener.cpp.
extern DebugListener *debugListener;
diff --git a/3rdparty/taglib/toolkit/tdebug.h b/3rdparty/taglib/toolkit/tdebug.h
index 80d00d39e..0561401a5 100644
--- a/3rdparty/taglib/toolkit/tdebug.h
+++ b/3rdparty/taglib/toolkit/tdebug.h
@@ -26,7 +26,7 @@
#ifndef TAGLIB_DEBUG_H
#define TAGLIB_DEBUG_H
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class String;
class ByteVector;
diff --git a/3rdparty/taglib/toolkit/tdebuglistener.cpp b/3rdparty/taglib/toolkit/tdebuglistener.cpp
index 48912222d..76a314b30 100644
--- a/3rdparty/taglib/toolkit/tdebuglistener.cpp
+++ b/3rdparty/taglib/toolkit/tdebuglistener.cpp
@@ -32,7 +32,7 @@
# include
#endif
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -63,7 +63,7 @@ namespace
DefaultListener defaultListener;
}
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
DebugListener *debugListener = &defaultListener;
diff --git a/3rdparty/taglib/toolkit/tdebuglistener.h b/3rdparty/taglib/toolkit/tdebuglistener.h
index 3c8e1185c..49b9f08b7 100644
--- a/3rdparty/taglib/toolkit/tdebuglistener.h
+++ b/3rdparty/taglib/toolkit/tdebuglistener.h
@@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "tstring.h"
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
//! An abstraction for the listener to the debug messages.
diff --git a/3rdparty/taglib/toolkit/tfile.cpp b/3rdparty/taglib/toolkit/tfile.cpp
index 09d346fb9..26de92703 100644
--- a/3rdparty/taglib/toolkit/tfile.cpp
+++ b/3rdparty/taglib/toolkit/tfile.cpp
@@ -66,7 +66,7 @@
#include "dsffile.h"
#include "dsdifffile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class File::FilePrivate
{
diff --git a/3rdparty/taglib/toolkit/tfile.h b/3rdparty/taglib/toolkit/tfile.h
index 55f53a521..ed0d5d20b 100644
--- a/3rdparty/taglib/toolkit/tfile.h
+++ b/3rdparty/taglib/toolkit/tfile.h
@@ -32,7 +32,7 @@
#include "tbytevector.h"
#include "tiostream.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class String;
class Tag;
diff --git a/3rdparty/taglib/toolkit/tfilestream.cpp b/3rdparty/taglib/toolkit/tfilestream.cpp
index c90219f4d..3495751aa 100644
--- a/3rdparty/taglib/toolkit/tfilestream.cpp
+++ b/3rdparty/taglib/toolkit/tfilestream.cpp
@@ -34,7 +34,7 @@
# include
#endif
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
diff --git a/3rdparty/taglib/toolkit/tfilestream.h b/3rdparty/taglib/toolkit/tfilestream.h
index aa4d71b30..80188d48d 100644
--- a/3rdparty/taglib/toolkit/tfilestream.h
+++ b/3rdparty/taglib/toolkit/tfilestream.h
@@ -31,7 +31,7 @@
#include "tbytevector.h"
#include "tiostream.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class String;
class Tag;
diff --git a/3rdparty/taglib/toolkit/tiostream.cpp b/3rdparty/taglib/toolkit/tiostream.cpp
index de0bd5053..5c8df06bd 100644
--- a/3rdparty/taglib/toolkit/tiostream.cpp
+++ b/3rdparty/taglib/toolkit/tiostream.cpp
@@ -30,7 +30,7 @@
#include "tiostream.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
#ifdef _WIN32
diff --git a/3rdparty/taglib/toolkit/tiostream.h b/3rdparty/taglib/toolkit/tiostream.h
index 110531644..943be432c 100644
--- a/3rdparty/taglib/toolkit/tiostream.h
+++ b/3rdparty/taglib/toolkit/tiostream.h
@@ -30,7 +30,7 @@
#include "taglib.h"
#include "tbytevector.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
#ifdef _WIN32
class TAGLIB_EXPORT FileName
diff --git a/3rdparty/taglib/toolkit/tlist.h b/3rdparty/taglib/toolkit/tlist.h
index 377b82481..9cc356f79 100644
--- a/3rdparty/taglib/toolkit/tlist.h
+++ b/3rdparty/taglib/toolkit/tlist.h
@@ -30,7 +30,7 @@
#include
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A generic, implicitly shared list.
@@ -40,7 +40,7 @@ namespace TagLib {
*
* \code
*
- * TagLib::List l = someOtherIntList;
+ * Strawberry_TagLib::TagLib::List l = someOtherIntList;
*
* \endcode
*
diff --git a/3rdparty/taglib/toolkit/tlist.tcc b/3rdparty/taglib/toolkit/tlist.tcc
index 478f09834..dd22af15e 100644
--- a/3rdparty/taglib/toolkit/tlist.tcc
+++ b/3rdparty/taglib/toolkit/tlist.tcc
@@ -26,7 +26,7 @@
#include
#include "trefcounter.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
////////////////////////////////////////////////////////////////////////////////
// public members
@@ -320,4 +320,4 @@ void List::detach()
}
}
-} // namespace TagLib
+} // namespace Strawberry_TagLib::TagLib
diff --git a/3rdparty/taglib/toolkit/tmap.h b/3rdparty/taglib/toolkit/tmap.h
index f54e5a2a9..8cc6e878c 100644
--- a/3rdparty/taglib/toolkit/tmap.h
+++ b/3rdparty/taglib/toolkit/tmap.h
@@ -30,7 +30,7 @@
#include "taglib.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A generic, implicitly shared map.
diff --git a/3rdparty/taglib/toolkit/tmap.tcc b/3rdparty/taglib/toolkit/tmap.tcc
index 2e4ed5ebf..1252c27df 100644
--- a/3rdparty/taglib/toolkit/tmap.tcc
+++ b/3rdparty/taglib/toolkit/tmap.tcc
@@ -25,7 +25,7 @@
#include "trefcounter.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
////////////////////////////////////////////////////////////////////////////////
// public members
@@ -196,4 +196,4 @@ void Map::detach()
}
}
-} // namespace TagLib
+} // namespace Strawberry_TagLib::TagLib
diff --git a/3rdparty/taglib/toolkit/tpropertymap.cpp b/3rdparty/taglib/toolkit/tpropertymap.cpp
index b3e1ec3ad..92bfc2439 100644
--- a/3rdparty/taglib/toolkit/tpropertymap.cpp
+++ b/3rdparty/taglib/toolkit/tpropertymap.cpp
@@ -25,7 +25,7 @@
#include "tpropertymap.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
PropertyMap::PropertyMap() : SimplePropertyMap()
diff --git a/3rdparty/taglib/toolkit/tpropertymap.h b/3rdparty/taglib/toolkit/tpropertymap.h
index 5933b89b2..16ae6df96 100644
--- a/3rdparty/taglib/toolkit/tpropertymap.h
+++ b/3rdparty/taglib/toolkit/tpropertymap.h
@@ -29,7 +29,7 @@
#include "tmap.h"
#include "tstringlist.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
typedef Map SimplePropertyMap;
diff --git a/3rdparty/taglib/toolkit/trefcounter.cpp b/3rdparty/taglib/toolkit/trefcounter.cpp
index 6638fcaa5..52b7ae75c 100644
--- a/3rdparty/taglib/toolkit/trefcounter.cpp
+++ b/3rdparty/taglib/toolkit/trefcounter.cpp
@@ -62,7 +62,7 @@
# define ATOMIC_DEC(x) (--x)
#endif
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
class RefCounter::RefCounterPrivate
diff --git a/3rdparty/taglib/toolkit/trefcounter.h b/3rdparty/taglib/toolkit/trefcounter.h
index db97c5385..44446dc60 100644
--- a/3rdparty/taglib/toolkit/trefcounter.h
+++ b/3rdparty/taglib/toolkit/trefcounter.h
@@ -56,7 +56,7 @@
*
* \warning This is not part of the TagLib public API!
*/
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
class TAGLIB_EXPORT RefCounter
diff --git a/3rdparty/taglib/toolkit/tstring.cpp b/3rdparty/taglib/toolkit/tstring.cpp
index c60a3e2ed..3dc9f7623 100644
--- a/3rdparty/taglib/toolkit/tstring.cpp
+++ b/3rdparty/taglib/toolkit/tstring.cpp
@@ -37,7 +37,7 @@
namespace
{
- using namespace TagLib;
+ using namespace Strawberry_TagLib::TagLib;
// Returns the native format of std::wstring.
String::Type wcharByteOrder()
@@ -136,7 +136,7 @@ namespace
}
}
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class String::StringPrivate : public RefCounter
{
@@ -147,7 +147,7 @@ public:
/*!
* Stores string in UTF-16. The byte order depends on the CPU endian.
*/
- TagLib::wstring data;
+ Strawberry_TagLib::TagLib::wstring data;
/*!
* This is only used to hold the the most recent value of toCString().
@@ -198,7 +198,7 @@ String::String(const wstring &s, Type t) :
copyFromUTF16(d->data, s.c_str(), s.length(), t);
}
else {
- debug("String::String() -- TagLib::wstring should not contain Latin1 or UTF-8.");
+ debug("String::String() -- Strawberry_TagLib::TagLib::wstring should not contain Latin1 or UTF-8.");
}
}
@@ -285,7 +285,7 @@ std::string String::to8Bit(bool unicode) const
return std::string(v.data(), v.size());
}
-TagLib::wstring String::toWString() const
+Strawberry_TagLib::TagLib::wstring String::toWString() const
{
return d->data;
}
@@ -718,28 +718,28 @@ const String::Type String::WCharByteOrder = wcharByteOrder();
// related non-member functions
////////////////////////////////////////////////////////////////////////////////
-const TagLib::String operator+(const TagLib::String &s1, const TagLib::String &s2)
+const Strawberry_TagLib::TagLib::String operator+(const Strawberry_TagLib::TagLib::String &s1, const Strawberry_TagLib::TagLib::String &s2)
{
- TagLib::String s(s1);
+ Strawberry_TagLib::TagLib::String s(s1);
s.append(s2);
return s;
}
-const TagLib::String operator+(const char *s1, const TagLib::String &s2)
+const Strawberry_TagLib::TagLib::String operator+(const char *s1, const Strawberry_TagLib::TagLib::String &s2)
{
- TagLib::String s(s1);
+ Strawberry_TagLib::TagLib::String s(s1);
s.append(s2);
return s;
}
-const TagLib::String operator+(const TagLib::String &s1, const char *s2)
+const Strawberry_TagLib::TagLib::String operator+(const Strawberry_TagLib::TagLib::String &s1, const char *s2)
{
- TagLib::String s(s1);
+ Strawberry_TagLib::TagLib::String s(s1);
s.append(s2);
return s;
}
-std::ostream &operator<<(std::ostream &s, const TagLib::String &str)
+std::ostream &operator<<(std::ostream &s, const Strawberry_TagLib::TagLib::String &str)
{
s << str.to8Bit();
return s;
diff --git a/3rdparty/taglib/toolkit/tstring.h b/3rdparty/taglib/toolkit/tstring.h
index b1be04b8c..7be908a03 100644
--- a/3rdparty/taglib/toolkit/tstring.h
+++ b/3rdparty/taglib/toolkit/tstring.h
@@ -34,24 +34,24 @@
#include
/*!
- * \relates TagLib::String
+ * \relates Strawberry_TagLib::TagLib::String
*
- * Converts a QString to a TagLib::String without a requirement to link to Qt.
+ * Converts a QString to a Strawberry_TagLib::TagLib::String without a requirement to link to Qt.
*
* \note consider conversion via usual char-by-char for loop to avoid UTF16->UTF8->UTF16
* conversion happening in the background
*/
#if defined(QT_VERSION) && (QT_VERSION >= 0x040000)
-#define QStringToTString(s) TagLib::String(s.toUtf8().data(), TagLib::String::UTF8)
+#define QStringToTString(s) Strawberry_TagLib::TagLib::String(s.toUtf8().data(), Strawberry_TagLib::TagLib::String::UTF8)
#else
-#define QStringToTString(s) TagLib::String(s.utf8().data(), TagLib::String::UTF8)
+#define QStringToTString(s) Strawberry_TagLib::TagLib::String(s.utf8().data(), Strawberry_TagLib::TagLib::String::UTF8)
#endif
/*!
- * \relates TagLib::String
+ * \relates Strawberry_TagLib::TagLib::String
*
- * Converts a TagLib::String to a QString without a requirement to link to Qt.
+ * Converts a Strawberry_TagLib::TagLib::String to a QString without a requirement to link to Qt.
*
* \note consider conversion via usual char-by-char for loop to avoid UTF16->UTF8->UTF16
* conversion happening in the background
@@ -60,7 +60,7 @@
#define TStringToQString(s) QString::fromUtf8(s.toCString(true))
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class StringList;
@@ -68,7 +68,7 @@ namespace TagLib {
/*!
* This is an implicitly shared \e wide string. For storage it uses
- * TagLib::wstring, but as this is an implementation detail this of
+ * Strawberry_TagLib::TagLib::wstring, but as this is an implementation detail this of
* course could change. Strings are stored internally as UTF-16(without BOM/
* CPU byte order)
*
@@ -86,8 +86,8 @@ namespace TagLib {
public:
#ifndef DO_NOT_DOCUMENT
- typedef TagLib::wstring::iterator Iterator;
- typedef TagLib::wstring::const_iterator ConstIterator;
+ typedef Strawberry_TagLib::TagLib::wstring::iterator Iterator;
+ typedef Strawberry_TagLib::TagLib::wstring::const_iterator ConstIterator;
#endif
/**
@@ -549,32 +549,32 @@ namespace TagLib {
}
/*!
- * \relates TagLib::String
+ * \relates Strawberry_TagLib::TagLib::String
*
* Concatenates \a s1 and \a s2 and returns the result as a string.
*/
-TAGLIB_EXPORT const TagLib::String operator+(const TagLib::String &s1, const TagLib::String &s2);
+TAGLIB_EXPORT const Strawberry_TagLib::TagLib::String operator+(const Strawberry_TagLib::TagLib::String &s1, const Strawberry_TagLib::TagLib::String &s2);
/*!
- * \relates TagLib::String
+ * \relates Strawberry_TagLib::TagLib::String
*
* Concatenates \a s1 and \a s2 and returns the result as a string.
*/
-TAGLIB_EXPORT const TagLib::String operator+(const char *s1, const TagLib::String &s2);
+TAGLIB_EXPORT const Strawberry_TagLib::TagLib::String operator+(const char *s1, const Strawberry_TagLib::TagLib::String &s2);
/*!
- * \relates TagLib::String
+ * \relates Strawberry_TagLib::TagLib::String
*
* Concatenates \a s1 and \a s2 and returns the result as a string.
*/
-TAGLIB_EXPORT const TagLib::String operator+(const TagLib::String &s1, const char *s2);
+TAGLIB_EXPORT const Strawberry_TagLib::TagLib::String operator+(const Strawberry_TagLib::TagLib::String &s1, const char *s2);
/*!
- * \relates TagLib::String
+ * \relates Strawberry_TagLib::TagLib::String
*
* Send the string to an output stream.
*/
-TAGLIB_EXPORT std::ostream &operator<<(std::ostream &s, const TagLib::String &str);
+TAGLIB_EXPORT std::ostream &operator<<(std::ostream &s, const Strawberry_TagLib::TagLib::String &str);
#endif
diff --git a/3rdparty/taglib/toolkit/tstringlist.cpp b/3rdparty/taglib/toolkit/tstringlist.cpp
index 4b8abce7a..171adb06a 100644
--- a/3rdparty/taglib/toolkit/tstringlist.cpp
+++ b/3rdparty/taglib/toolkit/tstringlist.cpp
@@ -25,7 +25,7 @@
#include "tstringlist.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class StringListPrivate
{
diff --git a/3rdparty/taglib/toolkit/tstringlist.h b/3rdparty/taglib/toolkit/tstringlist.h
index 41b7f6ecd..dbd4321fe 100644
--- a/3rdparty/taglib/toolkit/tstringlist.h
+++ b/3rdparty/taglib/toolkit/tstringlist.h
@@ -33,7 +33,7 @@
#include
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
//! A list of strings
@@ -107,9 +107,9 @@ namespace TagLib {
}
/*!
- * \related TagLib::StringList
+ * \related Strawberry_TagLib::TagLib::StringList
* Send the StringList to an output stream.
*/
-std::ostream &operator<<(std::ostream &s, const TagLib::StringList &l);
+std::ostream &operator<<(std::ostream &s, const Strawberry_TagLib::TagLib::StringList &l);
#endif
diff --git a/3rdparty/taglib/toolkit/tutils.h b/3rdparty/taglib/toolkit/tutils.h
index 6d96cd12d..bf109758e 100644
--- a/3rdparty/taglib/toolkit/tutils.h
+++ b/3rdparty/taglib/toolkit/tutils.h
@@ -49,7 +49,7 @@
#include
#include
-namespace TagLib
+namespace Strawberry_TagLib::TagLib
{
namespace Utils
{
diff --git a/3rdparty/taglib/toolkit/tzlib.cpp b/3rdparty/taglib/toolkit/tzlib.cpp
index 6d07ba3d2..b65b6b08b 100644
--- a/3rdparty/taglib/toolkit/tzlib.cpp
+++ b/3rdparty/taglib/toolkit/tzlib.cpp
@@ -35,7 +35,7 @@
#include "tzlib.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
bool zlib::isAvailable()
{
diff --git a/3rdparty/taglib/toolkit/tzlib.h b/3rdparty/taglib/toolkit/tzlib.h
index b1f1fcaf8..b23c3f547 100644
--- a/3rdparty/taglib/toolkit/tzlib.h
+++ b/3rdparty/taglib/toolkit/tzlib.h
@@ -32,7 +32,7 @@
#ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace zlib {
diff --git a/3rdparty/taglib/trueaudio/trueaudiofile.cpp b/3rdparty/taglib/trueaudio/trueaudiofile.cpp
index 50713aec7..ef47111c6 100644
--- a/3rdparty/taglib/trueaudio/trueaudiofile.cpp
+++ b/3rdparty/taglib/trueaudio/trueaudiofile.cpp
@@ -40,7 +40,7 @@
#include "id3v2tag.h"
#include "id3v2header.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -90,7 +90,7 @@ bool TrueAudio::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
TrueAudio::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -99,7 +99,7 @@ TrueAudio::File::File(FileName file, bool readProperties, Properties::ReadStyle)
TrueAudio::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate(frameFactory))
{
if(isOpen())
@@ -107,7 +107,7 @@ TrueAudio::File::File(FileName file, ID3v2::FrameFactory *frameFactory,
}
TrueAudio::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
@@ -116,7 +116,7 @@ TrueAudio::File::File(IOStream *stream, bool readProperties, Properties::ReadSty
TrueAudio::File::File(IOStream *stream, ID3v2::FrameFactory *frameFactory,
bool readProperties, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate(frameFactory))
{
if(isOpen())
@@ -128,7 +128,7 @@ TrueAudio::File::~File()
delete d;
}
-TagLib::Tag *TrueAudio::File::tag() const
+Strawberry_TagLib::TagLib::Tag *TrueAudio::File::tag() const
{
return &d->tag;
}
diff --git a/3rdparty/taglib/trueaudio/trueaudiofile.h b/3rdparty/taglib/trueaudio/trueaudiofile.h
index 3737ac63f..c8a416d2f 100644
--- a/3rdparty/taglib/trueaudio/trueaudiofile.h
+++ b/3rdparty/taglib/trueaudio/trueaudiofile.h
@@ -33,7 +33,7 @@
#include "tfile.h"
#include "trueaudioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class Tag;
@@ -51,16 +51,16 @@ namespace TagLib {
namespace TrueAudio {
- //! An implementation of TagLib::File with TrueAudio specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with TrueAudio specific methods
/*!
* This implements and provides an interface for TrueAudio 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 TrueAudio files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
@@ -136,7 +136,7 @@ namespace TagLib {
/*!
* Returns the Tag for this file.
*/
- virtual TagLib::Tag *tag() const;
+ virtual Strawberry_TagLib::TagLib::Tag *tag() const;
/*!
* Implements the unified property interface -- export function.
diff --git a/3rdparty/taglib/trueaudio/trueaudioproperties.cpp b/3rdparty/taglib/trueaudio/trueaudioproperties.cpp
index de3ec1b12..7ddbabb87 100644
--- a/3rdparty/taglib/trueaudio/trueaudioproperties.cpp
+++ b/3rdparty/taglib/trueaudio/trueaudioproperties.cpp
@@ -34,7 +34,7 @@
#include "trueaudioproperties.h"
#include "trueaudiofile.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class TrueAudio::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/trueaudio/trueaudioproperties.h b/3rdparty/taglib/trueaudio/trueaudioproperties.h
index 8dfcf3750..a922e7eca 100644
--- a/3rdparty/taglib/trueaudio/trueaudioproperties.h
+++ b/3rdparty/taglib/trueaudio/trueaudioproperties.h
@@ -32,7 +32,7 @@
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace TrueAudio {
diff --git a/3rdparty/taglib/wavpack/wavpackfile.cpp b/3rdparty/taglib/wavpack/wavpackfile.cpp
index 01bdba36c..e7678b5f8 100644
--- a/3rdparty/taglib/wavpack/wavpackfile.cpp
+++ b/3rdparty/taglib/wavpack/wavpackfile.cpp
@@ -40,7 +40,7 @@
#include "apetag.h"
#include "apefooter.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
namespace
{
@@ -88,7 +88,7 @@ bool WavPack::File::isSupported(IOStream *stream)
////////////////////////////////////////////////////////////////////////////////
WavPack::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
- TagLib::File(file),
+ Strawberry_TagLib::TagLib::File(file),
d(new FilePrivate())
{
if(isOpen())
@@ -96,7 +96,7 @@ WavPack::File::File(FileName file, bool readProperties, Properties::ReadStyle) :
}
WavPack::File::File(IOStream *stream, bool readProperties, Properties::ReadStyle) :
- TagLib::File(stream),
+ Strawberry_TagLib::TagLib::File(stream),
d(new FilePrivate())
{
if(isOpen())
@@ -108,7 +108,7 @@ WavPack::File::~File()
delete d;
}
-TagLib::Tag *WavPack::File::tag() const
+Strawberry_TagLib::TagLib::Tag *WavPack::File::tag() const
{
return &d->tag;
}
diff --git a/3rdparty/taglib/wavpack/wavpackfile.h b/3rdparty/taglib/wavpack/wavpackfile.h
index ccc4ef6e8..e3730d2f7 100644
--- a/3rdparty/taglib/wavpack/wavpackfile.h
+++ b/3rdparty/taglib/wavpack/wavpackfile.h
@@ -34,7 +34,7 @@
#include "taglib_export.h"
#include "wavpackproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
class Tag;
@@ -52,16 +52,16 @@ namespace TagLib {
namespace WavPack {
- //! An implementation of TagLib::File with WavPack specific methods
+ //! An implementation of Strawberry_TagLib::TagLib::File with WavPack specific methods
/*!
* This implements and provides an interface for WavPack 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 WavPack files.
*/
- class TAGLIB_EXPORT File : public TagLib::File
+ class TAGLIB_EXPORT File : public Strawberry_TagLib::TagLib::File
{
public:
/*!
@@ -107,7 +107,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.
diff --git a/3rdparty/taglib/wavpack/wavpackproperties.cpp b/3rdparty/taglib/wavpack/wavpackproperties.cpp
index c1d04fd29..6cc31a708 100644
--- a/3rdparty/taglib/wavpack/wavpackproperties.cpp
+++ b/3rdparty/taglib/wavpack/wavpackproperties.cpp
@@ -36,7 +36,7 @@
// Implementation of this class is based on the information at:
// http://www.wavpack.com/file_format.txt
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
class WavPack::Properties::PropertiesPrivate
{
diff --git a/3rdparty/taglib/wavpack/wavpackproperties.h b/3rdparty/taglib/wavpack/wavpackproperties.h
index 0f5d1dcbc..60202c9c3 100644
--- a/3rdparty/taglib/wavpack/wavpackproperties.h
+++ b/3rdparty/taglib/wavpack/wavpackproperties.h
@@ -33,7 +33,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace WavPack {
diff --git a/3rdparty/taglib/xm/xmfile.cpp b/3rdparty/taglib/xm/xmfile.cpp
index 12b13c992..1d64d9392 100644
--- a/3rdparty/taglib/xm/xmfile.cpp
+++ b/3rdparty/taglib/xm/xmfile.cpp
@@ -32,7 +32,7 @@
#include
#include
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace XM;
/*!
@@ -75,7 +75,7 @@ public:
* Reads associated values from \a file, but never reads more
* then \a limit bytes.
*/
- virtual unsigned int read(TagLib::File &file, unsigned int limit) = 0;
+ virtual unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit) = 0;
/*!
* Returns the number of bytes this reader would like to read.
@@ -90,10 +90,10 @@ public:
{
}
- unsigned int read(TagLib::File &file, unsigned int limit)
+ unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
{
unsigned int count = std::min(m_size, limit);
- file.seek(count, TagLib::File::Current);
+ file.seek(count, Strawberry_TagLib::TagLib::File::Current);
return count;
}
@@ -126,7 +126,7 @@ public:
{
}
- unsigned int read(TagLib::File &file, unsigned int limit)
+ unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
{
ByteVector data = file.readBlock(std::min(m_size, limit));
unsigned int count = data.size();
@@ -153,7 +153,7 @@ class ByteReader : public ValueReader
public:
explicit ByteReader(unsigned char &byte) : ValueReader(byte) {}
- unsigned int read(TagLib::File &file, unsigned int limit)
+ unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
{
ByteVector data = file.readBlock(std::min(1U,limit));
if(data.size() > 0) {
@@ -187,7 +187,7 @@ public:
U16Reader(unsigned short &value, bool bigEndian)
: NumberReader(value, bigEndian) {}
- unsigned int read(TagLib::File &file, unsigned int limit)
+ unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
{
ByteVector data = file.readBlock(std::min(2U,limit));
value = data.toUShort(bigEndian);
@@ -208,7 +208,7 @@ public:
{
}
- unsigned int read(TagLib::File &file, unsigned int limit)
+ unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
{
ByteVector data = file.readBlock(std::min(4U,limit));
value = data.toUInt(bigEndian);
@@ -327,7 +327,7 @@ public:
return size;
}
- unsigned int read(TagLib::File &file, unsigned int limit)
+ unsigned int read(Strawberry_TagLib::TagLib::File &file, unsigned int limit)
{
unsigned int sumcount = 0;
for(List::ConstIterator i = m_readers.begin();
diff --git a/3rdparty/taglib/xm/xmfile.h b/3rdparty/taglib/xm/xmfile.h
index 9211078ad..fc4dc320a 100644
--- a/3rdparty/taglib/xm/xmfile.h
+++ b/3rdparty/taglib/xm/xmfile.h
@@ -33,7 +33,7 @@
#include "modtag.h"
#include "xmproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace XM {
diff --git a/3rdparty/taglib/xm/xmproperties.cpp b/3rdparty/taglib/xm/xmproperties.cpp
index 93d849868..ad1e9d3ad 100644
--- a/3rdparty/taglib/xm/xmproperties.cpp
+++ b/3rdparty/taglib/xm/xmproperties.cpp
@@ -26,7 +26,7 @@
#include "xmproperties.h"
-using namespace TagLib;
+using namespace Strawberry_TagLib::TagLib;
using namespace XM;
class XM::Properties::PropertiesPrivate
diff --git a/3rdparty/taglib/xm/xmproperties.h b/3rdparty/taglib/xm/xmproperties.h
index 24a52217a..1f8e4cc8e 100644
--- a/3rdparty/taglib/xm/xmproperties.h
+++ b/3rdparty/taglib/xm/xmproperties.h
@@ -30,7 +30,7 @@
#include "tstring.h"
#include "audioproperties.h"
-namespace TagLib {
+namespace Strawberry_TagLib::TagLib {
namespace XM {
class TAGLIB_EXPORT Properties : public AudioProperties {
friend class File;
diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp
index 2be659a3d..3c5acdb55 100644
--- 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() {}
diff --git a/ext/libstrawberry-tagreader/tagreader.h b/ext/libstrawberry-tagreader/tagreader.h
index 5fbbe3fbf..3e2c937fe 100644
--- 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;
diff --git a/src/config.h.in b/src/config.h.in
index 9dd16481f..dc1d23800 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -55,6 +55,7 @@
#cmakedefine HAVE_KEYSYMDEF_H
#cmakedefine HAVE_XF86KEYSYM_H
+#cmakedefine USE_SYSTEM_TAGLIB
#cmakedefine USE_BUNDLE
#define USE_BUNDLE_DIR "${USE_BUNDLE_DIR}"
diff --git a/src/core/song.cpp b/src/core/song.cpp
index eabbda36c..1aa8f31d9 100644
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -69,6 +69,9 @@
#include "tagreadermessages.pb.h"
using std::sort;
+#ifndef USE_SYSTEM_TAGLIB
+using namespace Strawberry_TagLib;
+#endif
const QStringList Song::kColumns = QStringList() << "title"
<< "album"