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

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