dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use namespace for static taglib to avoid collision with taglib

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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 {