diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-12-09 19:18:11 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-12-09 19:31:49 +0100 |
| commit | 2eef91c1abf8410d399165310546e9da1a1e7b7d (patch) | |
| tree | 333d1a287955e1c683ec35542afa432dc3aa7f5a /src/library/dlganalysis.cpp | |
| parent | f10b7657a3060cb650bbc69788c59446c5e9e629 (diff) | |
| parent | da2e78f0ca716b44ffb0e373a59300c213e4033e (diff) | |
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into library-autodj-fixes
# Conflicts:
# src/library/baseplaylistfeature.cpp
# src/library/baseplaylistfeature.h
# src/widget/wtracktableview.cpp
Diffstat (limited to 'src/library/dlganalysis.cpp')
| -rw-r--r-- | src/library/dlganalysis.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/library/dlganalysis.cpp b/src/library/dlganalysis.cpp index a51efb3c8d..be88c03769 100644 --- a/src/library/dlganalysis.cpp +++ b/src/library/dlganalysis.cpp @@ -5,7 +5,7 @@ #include "widget/wanalysislibrarytableview.h" #include "analyzer/analyzerprogress.h" #include "library/dao/trackschema.h" -#include "library/trackcollection.h" +#include "library/trackcollectionmanager.h" #include "library/dlganalysis.h" #include "library/library.h" #include "util/assert.h" @@ -15,13 +15,12 @@ DlgAnalysis::DlgAnalysis(QWidget* parent, Library* pLibrary) : QWidget(parent), m_pConfig(pConfig), - m_pTrackCollection(&pLibrary->trackCollection()), m_bAnalysisActive(false) { setupUi(this); m_songsButtonGroup.addButton(radioButtonRecentlyAdded); m_songsButtonGroup.addButton(radioButtonAllSongs); - m_pAnalysisLibraryTableView = new WAnalysisLibraryTableView(this, pConfig, m_pTrackCollection); + m_pAnalysisLibraryTableView = new WAnalysisLibraryTableView(this, pConfig, pLibrary->trackCollections()); connect(m_pAnalysisLibraryTableView, &WAnalysisLibraryTableView::loadTrack, this, @@ -44,7 +43,7 @@ DlgAnalysis::DlgAnalysis(QWidget* parent, box->insertWidget(1, m_pAnalysisLibraryTableView); } - m_pAnalysisLibraryTableModel = new AnalysisLibraryTableModel(this, m_pTrackCollection); + m_pAnalysisLibraryTableModel = new AnalysisLibraryTableModel(this, pLibrary->trackCollections()); m_pAnalysisLibraryTableView->loadTrackModel(m_pAnalysisLibraryTableModel); connect(radioButtonRecentlyAdded, |