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

12
3rdparty/taglib/trueaudio/trueaudiofile.cpp vendored
View File

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

12
3rdparty/taglib/trueaudio/trueaudiofile.h vendored
View File

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

2
3rdparty/taglib/trueaudio/trueaudioproperties.cpp vendored
View File

@@ -34,7 +34,7 @@
#include "trueaudioproperties.h"
#include "trueaudiofile.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class TrueAudio::Properties::PropertiesPrivate
{

2
3rdparty/taglib/trueaudio/trueaudioproperties.h vendored
View File

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