Use namespace for static taglib to avoid collision with taglib
linked to vlc
This commit is contained in:
2
3rdparty/taglib/s3m/s3mfile.cpp
vendored
2
3rdparty/taglib/s3m/s3mfile.cpp
vendored
@@ -32,7 +32,7 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
using namespace TagLib;
|
||||
using namespace Strawberry_TagLib::TagLib;
|
||||
using namespace S3M;
|
||||
|
||||
class S3M::File::FilePrivate
|
||||
|
||||
2
3rdparty/taglib/s3m/s3mfile.h
vendored
2
3rdparty/taglib/s3m/s3mfile.h
vendored
@@ -33,7 +33,7 @@
|
||||
#include "modtag.h"
|
||||
#include "s3mproperties.h"
|
||||
|
||||
namespace TagLib {
|
||||
namespace Strawberry_TagLib::TagLib {
|
||||
|
||||
namespace S3M {
|
||||
|
||||
|
||||
2
3rdparty/taglib/s3m/s3mproperties.cpp
vendored
2
3rdparty/taglib/s3m/s3mproperties.cpp
vendored
@@ -26,7 +26,7 @@
|
||||
|
||||
#include "s3mproperties.h"
|
||||
|
||||
using namespace TagLib;
|
||||
using namespace Strawberry_TagLib::TagLib;
|
||||
using namespace S3M;
|
||||
|
||||
class S3M::Properties::PropertiesPrivate
|
||||
|
||||
2
3rdparty/taglib/s3m/s3mproperties.h
vendored
2
3rdparty/taglib/s3m/s3mproperties.h
vendored
@@ -29,7 +29,7 @@
|
||||
#include "taglib.h"
|
||||
#include "audioproperties.h"
|
||||
|
||||
namespace TagLib {
|
||||
namespace Strawberry_TagLib::TagLib {
|
||||
namespace S3M {
|
||||
class TAGLIB_EXPORT Properties : public AudioProperties {
|
||||
friend class File;
|
||||
|
||||
Reference in New Issue
Block a user