diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-15 23:32:16 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-10-15 23:32:16 +0200 |
| commit | 18b624fcaeb6ccb3cb159910d898b5c5d2d1afce (patch) | |
| tree | 27ec3251fb9a1d3a3d6c54a3ea848a1f41522153 /src/library/banshee | |
| parent | db7ae56032efc51efcce1cbd1e6ac653f3bd8c54 (diff) | |
| parent | 79d0136a2aa3e5027684e094f7179aa0380e5e36 (diff) | |
Merge branch '2.3' of github.com:mixxxdj/mixxx into master
Diffstat (limited to 'src/library/banshee')
| -rw-r--r-- | src/library/banshee/bansheefeature.cpp | 14 | ||||
| -rw-r--r-- | src/library/banshee/bansheeplaylistmodel.cpp | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/library/banshee/bansheefeature.cpp b/src/library/banshee/bansheefeature.cpp index 9cb2ffac97..ee6f9a8333 100644 --- a/src/library/banshee/bansheefeature.cpp +++ b/src/library/banshee/bansheefeature.cpp @@ -1,16 +1,16 @@ +#include "library/banshee/bansheefeature.h" + +#include <QList> #include <QMessageBox> #include <QtDebug> -#include <QList> - -#include "library/banshee/bansheefeature.h" #include "library/banshee/bansheedbconnection.h" +#include "library/banshee/bansheeplaylistmodel.h" +#include "library/baseexternalplaylistmodel.h" +#include "library/dao/settingsdao.h" #include "library/library.h" #include "library/trackcollectionmanager.h" -#include "library/dao/settingsdao.h" -#include "library/baseexternalplaylistmodel.h" -#include "library/banshee/bansheeplaylistmodel.h" - +#include "track/track.h" const QString BansheeFeature::BANSHEE_MOUNT_KEY = "mixxx.BansheeFeature.mount"; QString BansheeFeature::m_databaseFile; diff --git a/src/library/banshee/bansheeplaylistmodel.cpp b/src/library/banshee/bansheeplaylistmodel.cpp index 96713681ad..19cb1b028e 100644 --- a/src/library/banshee/bansheeplaylistmodel.cpp +++ b/src/library/banshee/bansheeplaylistmodel.cpp @@ -3,12 +3,14 @@ #include <QtDebug> #include "library/banshee/bansheedbconnection.h" +#include "library/previewbuttondelegate.h" #include "library/queryutil.h" #include "library/starrating.h" #include "library/trackcollectionmanager.h" #include "mixer/playermanager.h" #include "track/beatfactory.h" #include "track/beats.h" +#include "track/track.h" #define BANSHEE_TABLE "banshee" #define CLM_TRACK_ID "track_id" |