Adapt most changes from taglib2

2020-06-26 23:30:30 +02:00
parent 08882639e0
commit 5f71a558b9
374 changed files with 13708 additions and 4418 deletions
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -55,7 +55,6 @@
 #cmakedefine HAVE_KEYSYMDEF_H
 #cmakedefine HAVE_XF86KEYSYM_H

-#cmakedefine USE_SYSTEM_TAGLIB
 #cmakedefine USE_BUNDLE

 #define USE_BUNDLE_DIR "${USE_BUNDLE_DIR}"
--- a/src/core/song.cpp
+++ b/src/core/song.cpp
@@ -68,9 +68,7 @@
 #include "covermanager/albumcoverloader.h"
 #include "tagreadermessages.pb.h"

-#ifndef USE_SYSTEM_TAGLIB
 using namespace Strawberry_TagLib;
-#endif

 const QStringList Song::kColumns = QStringList() << "title"
                                                 << "album"