Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Use namespace for static taglib to avoid collision with taglib 

linked to vlc
This commit is contained in:
Jonas Kvinge 2019-04-25 23:00:25 +02:00
parent ace8ecbb4e
commit 1c926cca45
227 changed files with 460 additions and 447 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3rdparty/taglib/ape/apefile.cpp vendored
View File

@ -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;
}

12
3rdparty/taglib/ape/apefile.h vendored
View File

@ -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.

2
3rdparty/taglib/ape/apefooter.cpp vendored
View File

@ -32,7 +32,7 @@
#include "apefooter.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace APE;
class APE::Footer::FooterPrivate

2
3rdparty/taglib/ape/apefooter.h vendored
View File

@ -29,7 +29,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace APE {

2
3rdparty/taglib/ape/apeitem.cpp vendored
View File

@ -28,7 +28,7 @@
#include "apeitem.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace APE;
class APE::Item::ItemPrivate

2
3rdparty/taglib/ape/apeitem.h vendored
View File

@ -30,7 +30,7 @@
#include "tstring.h"
#include "tstringlist.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace APE {

2
3rdparty/taglib/ape/apeproperties.cpp vendored
View File

@ -36,7 +36,7 @@
#include "apetag.h"
#include "apefooter.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class APE::Properties::PropertiesPrivate
{

2
3rdparty/taglib/ape/apeproperties.h vendored
View File

@ -33,7 +33,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace APE {

8
3rdparty/taglib/ape/apetag.cpp vendored
View File

@ -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;

6
3rdparty/taglib/ape/apetag.h vendored
View File

@ -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.

2
3rdparty/taglib/asf/asfattribute.cpp vendored
View File

@ -31,7 +31,7 @@
#include "asffile.h"
#include "asfutils.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class ASF::Attribute::AttributePrivate : public RefCounter
{

4
3rdparty/taglib/asf/asfattribute.h vendored
View File

@ -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);

6
3rdparty/taglib/asf/asffile.cpp vendored
View File

@ -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())

10
3rdparty/taglib/asf/asffile.h vendored
View File

@ -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 <b>is still</b> owned by the ASF::File and should not be
* deleted by the user. It will be deleted when the file (object) is

2
3rdparty/taglib/asf/asfpicture.cpp vendored
View File

@ -32,7 +32,7 @@
#include "asfpicture.h"
#include "asfutils.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class ASF::Picture::PicturePrivate : public RefCounter
{

2
3rdparty/taglib/asf/asfpicture.h vendored
View File

@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "attachedpictureframe.h"
namespace TagLib
namespace Strawberry_TagLib::TagLib
{
namespace ASF
{

2
3rdparty/taglib/asf/asfproperties.cpp vendored
View File

@ -27,7 +27,7 @@
#include <tstring.h>
#include "asfproperties.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class ASF::Properties::PropertiesPrivate
{

2
3rdparty/taglib/asf/asfproperties.h vendored
View File

@ -30,7 +30,7 @@
#include "tstring.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ASF {

6
3rdparty/taglib/asf/asftag.cpp vendored
View File

@ -26,7 +26,7 @@
#include <tpropertymap.h>
#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();

4
3rdparty/taglib/asf/asftag.h vendored
View File

@ -32,14 +32,14 @@
#include "taglib_export.h"
#include "asfattribute.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ASF {
typedef List<Attribute> AttributeList;
typedef Map<String, AttributeList> AttributeListMap;
class TAGLIB_EXPORT Tag : public TagLib::Tag {
class TAGLIB_EXPORT Tag : public Strawberry_TagLib::TagLib::Tag {
friend class File;

2
3rdparty/taglib/asf/asfutils.h vendored
View File

@ -30,7 +30,7 @@
#ifndef DO_NOT_DOCUMENT // tell Doxygen not to document this header
namespace TagLib
namespace Strawberry_TagLib::TagLib
{
namespace ASF
{

2
3rdparty/taglib/audioproperties.cpp vendored
View File

@ -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.

4
3rdparty/taglib/audioproperties.h vendored
View File

@ -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.
*/

4
3rdparty/taglib/dsdiff/dsdiffdiintag.cpp vendored
View File

@ -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;
}

4
3rdparty/taglib/dsdiff/dsdiffdiintag.h vendored
View File

@ -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();

8
3rdparty/taglib/dsdiff/dsdifffile.cpp vendored
View File

@ -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;
}

10
3rdparty/taglib/dsdiff/dsdifffile.h vendored
View File

@ -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:
/*!

2
3rdparty/taglib/dsdiff/dsdiffproperties.cpp vendored
View File

@ -28,7 +28,7 @@
#include "dsdiffproperties.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class DSDIFF::Properties::PropertiesPrivate
{

2
3rdparty/taglib/dsdiff/dsdiffproperties.h vendored
View File

@ -28,7 +28,7 @@
#include "audioproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace DSDIFF {

6
3rdparty/taglib/dsf/dsffile.cpp vendored
View File

@ -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())

10
3rdparty/taglib/dsf/dsffile.h vendored
View File

@ -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:
/*!

4
3rdparty/taglib/dsf/dsfproperties.cpp vendored
View File

@ -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);

4
3rdparty/taglib/dsf/dsfproperties.h vendored
View File

@ -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:
/*!

2
3rdparty/taglib/fileref.cpp vendored
View File

@ -55,7 +55,7 @@
#include "dsffile.h"
#include "dsdifffile.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
namespace
{

10
3rdparty/taglib/fileref.h vendored
View File

@ -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

10
3rdparty/taglib/flac/flacfile.cpp vendored
View File

@ -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;
}

12
3rdparty/taglib/flac/flacfile.h vendored
View File

@ -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.

2
3rdparty/taglib/flac/flacmetadatablock.cpp vendored
View File

@ -27,7 +27,7 @@
#include <tdebug.h>
#include "flacmetadatablock.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class FLAC::MetadataBlock::MetadataBlockPrivate
{

2
3rdparty/taglib/flac/flacmetadatablock.h vendored
View File

@ -30,7 +30,7 @@
#include "tbytevector.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace FLAC {

2
3rdparty/taglib/flac/flacpicture.cpp vendored
View File

@ -27,7 +27,7 @@
#include <tdebug.h>
#include "flacpicture.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class FLAC::Picture::PicturePrivate
{

2
3rdparty/taglib/flac/flacpicture.h vendored
View File

@ -32,7 +32,7 @@
#include "taglib_export.h"
#include "flacmetadatablock.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace FLAC {

2
3rdparty/taglib/flac/flacproperties.cpp vendored
View File

@ -29,7 +29,7 @@
#include "flacproperties.h"
#include "flacfile.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class FLAC::Properties::PropertiesPrivate
{

2
3rdparty/taglib/flac/flacproperties.h vendored
View File

@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace FLAC {

2
3rdparty/taglib/flac/flacunknownmetadatablock.cpp vendored
View File

@ -28,7 +28,7 @@
#include <tstring.h>
#include "flacunknownmetadatablock.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class FLAC::UnknownMetadataBlock::UnknownMetadataBlockPrivate
{

2
3rdparty/taglib/flac/flacunknownmetadatablock.h vendored
View File

@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "flacmetadatablock.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace FLAC {

2
3rdparty/taglib/it/itfile.cpp vendored
View File

@ -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

2
3rdparty/taglib/it/itfile.h vendored
View File

@ -29,7 +29,7 @@
#include "modtag.h"
#include "itproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace IT {

2
3rdparty/taglib/it/itproperties.cpp vendored
View File

@ -26,7 +26,7 @@
#include "itproperties.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace IT;
class IT::Properties::PropertiesPrivate

2
3rdparty/taglib/it/itproperties.h vendored
View File

@ -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;

2
3rdparty/taglib/mod/modfile.cpp vendored
View File

@ -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

4
3rdparty/taglib/mod/modfile.h vendored
View File

@ -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:
/*!

6
3rdparty/taglib/mod/modfilebase.cpp vendored
View File

@ -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)
{
}

4
3rdparty/taglib/mod/modfilebase.h vendored
View File

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

2
3rdparty/taglib/mod/modproperties.cpp vendored
View File

@ -26,7 +26,7 @@
#include "modproperties.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace Mod;
class Mod::Properties::PropertiesPrivate

2
3rdparty/taglib/mod/modproperties.h vendored
View File

@ -29,7 +29,7 @@
#include "taglib.h"
#include "audioproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace Mod {

4
3rdparty/taglib/mod/modtag.cpp vendored
View File

@ -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())
{
}

4
3rdparty/taglib/mod/modtag.h vendored
View File

@ -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();

2
3rdparty/taglib/mp4/mp4atom.cpp vendored
View File

@ -29,7 +29,7 @@
#include <tstring.h>
#include "mp4atom.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
const char *MP4::Atom::containers[11] = {
"moov", "udta", "mdia", "meta", "ilst",

8
3rdparty/taglib/mp4/mp4atom.h vendored
View File

@ -33,12 +33,12 @@
#include "tfile.h"
#include "tlist.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace MP4 {
class Atom;
typedef TagLib::List<Atom *> AtomList;
typedef Strawberry_TagLib::TagLib::List<Atom *> AtomList;
enum AtomDataType
{
@ -72,7 +72,7 @@ namespace TagLib {
ByteVector data;
};
typedef TagLib::List<AtomData> AtomDataList;
typedef Strawberry_TagLib::TagLib::List<AtomData> 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;

2
3rdparty/taglib/mp4/mp4coverart.cpp vendored
View File

@ -28,7 +28,7 @@
#include "trefcounter.h"
#include "mp4coverart.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class MP4::CoverArt::CoverArtPrivate : public RefCounter
{

2
3rdparty/taglib/mp4/mp4coverart.h vendored
View File

@ -31,7 +31,7 @@
#include "taglib_export.h"
#include "mp4atom.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace MP4 {

6
3rdparty/taglib/mp4/mp4file.cpp vendored
View File

@ -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())

10
3rdparty/taglib/mp4/mp4file.h vendored
View File

@ -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 <b>is still</b> owned by the MP4::File and should not be
* deleted by the user. It will be deleted when the file (object) is

2
3rdparty/taglib/mp4/mp4item.cpp vendored
View File

@ -28,7 +28,7 @@
#include "trefcounter.h"
#include "mp4item.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class MP4::Item::ItemPrivate : public RefCounter
{

2
3rdparty/taglib/mp4/mp4item.h vendored
View File

@ -30,7 +30,7 @@
#include "mp4coverart.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace MP4 {

2
3rdparty/taglib/mp4/mp4properties.cpp vendored
View File

@ -29,7 +29,7 @@
#include "mp4atom.h"
#include "mp4properties.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class MP4::Properties::PropertiesPrivate
{

2
3rdparty/taglib/mp4/mp4properties.h vendored
View File

@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace MP4 {

6
3rdparty/taglib/mp4/mp4tag.cpp vendored
View File

@ -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;

10
3rdparty/taglib/mp4/mp4tag.h vendored
View File

@ -35,21 +35,21 @@
#include "mp4atom.h"
#include "mp4item.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace MP4 {
/*!
* \deprecated
*/
typedef TagLib::Map<String, Item> ItemListMap;
typedef TagLib::Map<String, Item> ItemMap;
typedef Strawberry_TagLib::TagLib::Map<String, Item> ItemListMap;
typedef Strawberry_TagLib::TagLib::Map<String, Item> 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();

8
3rdparty/taglib/mpc/mpcfile.cpp vendored
View File

@ -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;
}

12
3rdparty/taglib/mpc/mpcfile.h vendored
View File

@ -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.

2
3rdparty/taglib/mpc/mpcproperties.cpp vendored
View File

@ -31,7 +31,7 @@
#include "mpcproperties.h"
#include "mpcfile.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class MPC::Properties::PropertiesPrivate
{

2
3rdparty/taglib/mpc/mpcproperties.h vendored
View File

@ -29,7 +29,7 @@
#include "taglib_export.h"
#include "audioproperties.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace MPC {

2
3rdparty/taglib/mpeg/id3v1/id3v1genres.cpp vendored
View File

@ -25,7 +25,7 @@
#include "id3v1genres.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
namespace
{

2
3rdparty/taglib/mpeg/id3v1/id3v1genres.h vendored
View File

@ -30,7 +30,7 @@
#include "tstringlist.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v1 {
typedef Map<String, int> GenreMap;

6
3rdparty/taglib/mpeg/id3v1/id3v1tag.cpp vendored
View File

@ -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;

6
3rdparty/taglib/mpeg/id3v1/id3v1tag.h vendored
View File

@ -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:
/*!

6
3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.cpp vendored
View File

@ -28,7 +28,7 @@
#include <tstringlist.h>
#include <tdebug.h>
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);

2
3rdparty/taglib/mpeg/id3v2/frames/attachedpictureframe.h vendored
View File

@ -30,7 +30,7 @@
#include "id3v2header.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/chapterframe.cpp vendored
View File

@ -30,7 +30,7 @@
#include "chapterframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class ChapterFrame::ChapterFramePrivate

2
3rdparty/taglib/mpeg/id3v2/frames/chapterframe.h vendored
View File

@ -30,7 +30,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/commentsframe.cpp vendored
View File

@ -31,7 +31,7 @@
#include "commentsframe.h"
#include "tpropertymap.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class CommentsFrame::CommentsFramePrivate

2
3rdparty/taglib/mpeg/id3v2/frames/commentsframe.h vendored
View File

@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.cpp vendored
View File

@ -29,7 +29,7 @@
#include <tdebug.h>
#include <tpropertymap.h>
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class EventTimingCodesFrame::EventTimingCodesFramePrivate

4
3rdparty/taglib/mpeg/id3v2/frames/eventtimingcodesframe.h vendored
View File

@ -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<SynchedEvent> SynchedEventList;
typedef Strawberry_TagLib::TagLib::List<SynchedEvent> SynchedEventList;
/*!
* Construct an empty event timing codes frame.

2
3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.cpp vendored
View File

@ -31,7 +31,7 @@
#include "generalencapsulatedobjectframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class GeneralEncapsulatedObjectFrame::GeneralEncapsulatedObjectFramePrivate

2
3rdparty/taglib/mpeg/id3v2/frames/generalencapsulatedobjectframe.h vendored
View File

@ -33,7 +33,7 @@
#include "id3v2header.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.cpp vendored
View File

@ -29,7 +29,7 @@
#include "ownershipframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class OwnershipFrame::OwnershipFramePrivate

2
3rdparty/taglib/mpeg/id3v2/frames/ownershipframe.h vendored
View File

@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/podcastframe.cpp vendored
View File

@ -25,7 +25,7 @@
#include "podcastframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class PodcastFrame::PodcastFramePrivate

2
3rdparty/taglib/mpeg/id3v2/frames/podcastframe.h vendored
View File

@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.cpp vendored
View File

@ -27,7 +27,7 @@
#include "popularimeterframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class PopularimeterFrame::PopularimeterFramePrivate

2
3rdparty/taglib/mpeg/id3v2/frames/popularimeterframe.h vendored
View File

@ -29,7 +29,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/privateframe.cpp vendored
View File

@ -30,7 +30,7 @@
#include "privateframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;

2
3rdparty/taglib/mpeg/id3v2/frames/privateframe.h vendored
View File

@ -30,7 +30,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.cpp vendored
View File

@ -28,7 +28,7 @@
#include "relativevolumeframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
struct ChannelData

2
3rdparty/taglib/mpeg/id3v2/frames/relativevolumeframe.h vendored
View File

@ -30,7 +30,7 @@
#include "id3v2frame.h"
#include "taglib_export.h"
namespace TagLib {
namespace Strawberry_TagLib::TagLib {
namespace ID3v2 {

2
3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.cpp vendored
View File

@ -29,7 +29,7 @@
#include <tdebug.h>
#include <tpropertymap.h>
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class SynchronizedLyricsFrame::SynchronizedLyricsFramePrivate

4
3rdparty/taglib/mpeg/id3v2/frames/synchronizedlyricsframe.h vendored
View File

@ -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<SynchedText> SynchedTextList;
typedef Strawberry_TagLib::TagLib::List<SynchedText> SynchedTextList;
/*!
* Construct an empty synchronized lyrics frame that will use the text

2
3rdparty/taglib/mpeg/id3v2/frames/tableofcontentsframe.cpp vendored
View File

@ -29,7 +29,7 @@
#include "tableofcontentsframe.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
using namespace ID3v2;
class TableOfContentsFrame::TableOfContentsFramePrivate

Some files were not shown because too many files have changed in this diff Show More