summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2018-03-28 22:20:05 +0200
committerDaniel Schürmann <daschuer@mixxx.org>2018-03-28 22:20:05 +0200
commit6dea917a7483dc608cb1578db9daee974251d1c0 (patch)
treeaeee7caf782408b7420afff9cf15a3a4d3a399cf
parent5b872ce962e038c974087d4d46a2c4f13ed088c1 (diff)
fix connections for dialog preferences to analysis feature.
-rw-r--r--src/library/analysisfeature.cpp2
-rw-r--r--src/library/analysisfeature.h1
-rw-r--r--src/library/dlganalysis.cpp6
-rw-r--r--src/library/dlganalysis.h2
4 files changed, 9 insertions, 2 deletions
diff --git a/src/library/analysisfeature.cpp b/src/library/analysisfeature.cpp
index 8d47b3ad2a..4db15e4c56 100644
--- a/src/library/analysisfeature.cpp
+++ b/src/library/analysisfeature.cpp
@@ -25,6 +25,7 @@ AnalysisFeature::AnalysisFeature(Library* parent,
TrackCollection* pTrackCollection) :
LibraryFeature(parent),
m_pConfig(pConfig),
+ m_pLibrary(parent),
m_pDbConnectionPool(parent->dbConnectionPool()),
m_pTrackCollection(pTrackCollection),
m_pAnalyzerQueue(nullptr),
@@ -66,6 +67,7 @@ void AnalysisFeature::bindWidget(WLibrary* libraryWidget,
KeyboardEventFilter* keyboard) {
m_pAnalysisView = new DlgAnalysis(libraryWidget,
m_pConfig,
+ m_pLibrary,
m_pTrackCollection);
connect(m_pAnalysisView, SIGNAL(loadTrack(TrackPointer)),
this, SIGNAL(loadTrack(TrackPointer)));
diff --git a/src/library/analysisfeature.h b/src/library/analysisfeature.h
index b6b4211f99..74d6480b8c 100644
--- a/src/library/analysisfeature.h
+++ b/src/library/analysisfeature.h
@@ -65,6 +65,7 @@ class AnalysisFeature : public LibraryFeature {
void setTitleProgress(int trackNum, int totalNum);
UserSettingsPointer m_pConfig;
+ Library* m_pLibrary;
mixxx::DbConnectionPoolPtr m_pDbConnectionPool;
TrackCollection* m_pTrackCollection;
AnalyzerQueue* m_pAnalyzerQueue;
diff --git a/src/library/dlganalysis.cpp b/src/library/dlganalysis.cpp
index 4ff4751be8..8279c0c286 100644
--- a/src/library/dlganalysis.cpp
+++ b/src/library/dlganalysis.cpp
@@ -6,12 +6,14 @@
#include "library/dao/trackschema.h"
#include "library/trackcollection.h"
#include "library/dlganalysis.h"
+#include "library/library.h"
#include "util/assert.h"
-DlgAnalysis::DlgAnalysis(QWidget* pLibrary,
+DlgAnalysis::DlgAnalysis(QWidget* pParent,
UserSettingsPointer pConfig,
+ Library* pLibrary,
TrackCollection* pTrackCollection)
- : QWidget(pLibrary),
+ : QWidget(pParent),
m_pConfig(pConfig),
m_pTrackCollection(pTrackCollection),
m_bAnalysisActive(false),
diff --git a/src/library/dlganalysis.h b/src/library/dlganalysis.h
index 67c4a67664..0fc44a9220 100644
--- a/src/library/dlganalysis.h
+++ b/src/library/dlganalysis.h
@@ -11,12 +11,14 @@
class AnalysisLibraryTableModel;
class WAnalysisLibraryTableView;
+class Library;
class DlgAnalysis : public QWidget, public Ui::DlgAnalysis, public virtual LibraryView {
Q_OBJECT
public:
DlgAnalysis(QWidget *parent,
UserSettingsPointer pConfig,
+ Library* pLibrary,
TrackCollection* pTrackCollection);
~DlgAnalysis() override;