Use namespace for static taglib to avoid collision with taglib

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

View File

@@ -55,6 +55,7 @@
#cmakedefine HAVE_KEYSYMDEF_H
#cmakedefine HAVE_XF86KEYSYM_H
#cmakedefine USE_SYSTEM_TAGLIB
#cmakedefine USE_BUNDLE
#define USE_BUNDLE_DIR "${USE_BUNDLE_DIR}"

View File

@@ -69,6 +69,9 @@
#include "tagreadermessages.pb.h"
using std::sort;
#ifndef USE_SYSTEM_TAGLIB
using namespace Strawberry_TagLib;
#endif
const QStringList Song::kColumns = QStringList() << "title"
<< "album"