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

2
3rdparty/taglib/riff/aiff/aifffile.cpp vendored
View File

@@ -32,7 +32,7 @@
#include "aifffile.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class RIFF::AIFF::File::FilePrivate
{

10
3rdparty/taglib/riff/aiff/aifffile.h vendored
View File

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

2
3rdparty/taglib/riff/aiff/aiffproperties.cpp vendored
View File

@@ -28,7 +28,7 @@
#include "aifffile.h"
#include "aiffproperties.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
class RIFF::AIFF::Properties::PropertiesPrivate
{

2
3rdparty/taglib/riff/aiff/aiffproperties.h vendored
View File

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

6
3rdparty/taglib/riff/rifffile.cpp vendored
View File

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

8
3rdparty/taglib/riff/rifffile.h vendored
View File

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

2
3rdparty/taglib/riff/riffutils.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 RIFF
{

6
3rdparty/taglib/riff/wav/infotag.cpp vendored
View File

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

4
3rdparty/taglib/riff/wav/infotag.h vendored
View File

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

2
3rdparty/taglib/riff/wav/wavfile.cpp vendored
View File

@@ -34,7 +34,7 @@
#include "infotag.h"
#include "tagunion.h"
using namespace TagLib;
using namespace Strawberry_TagLib::TagLib;
namespace
{

10
3rdparty/taglib/riff/wav/wavfile.h vendored
View File

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

4
3rdparty/taglib/riff/wav/wavproperties.cpp vendored
View File

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

2
3rdparty/taglib/riff/wav/wavproperties.h vendored
View File

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