Fix saving of waveform analysis in database

The initialization of the AnalysisDao with the thread-local database
connection was missing. The restricted design of the analyzer API
required to move the AnalysisDao from AnalyzeWaveform to AnalyzerQueue.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/analyzer/analyzerwaveform.h b/src/analyzer/analyzerwaveform.h
index ccc4bdf778..085194707d 100644
--- a/src/analyzer/analyzerwaveform.h
+++ b/src/analyzer/analyzerwaveform.h
@@ -7,7 +7,6 @@
 
 #include "analyzer/analyzer.h"
 #include "waveform/waveform.h"
-#include "library/dao/analysisdao.h"
 #include "util/math.h"
 #include "util/performancetimer.h"
 
@@ -15,6 +14,7 @@
 //#define TEST_HEAT_MAP
 
 class EngineFilterIIRBase;
+class AnalysisDao;
 
 inline CSAMPLE scaleSignal(CSAMPLE invalue, FilterIndex index = FilterCount) {
     if (invalue == 0.0) {
@@ -137,7 +137,7 @@ struct WaveformStride {
 class AnalyzerWaveform : public Analyzer {
   public:
     explicit AnalyzerWaveform(
-            const UserSettingsPointer& pConfig);
+            AnalysisDao* pAnalysisDao);
     ~AnalyzerWaveform() override;
 
     bool initialize(TrackPointer tio, int sampleRate, int totalSamples) override;
@@ -154,7 +154,7 @@ class AnalyzerWaveform : public Analyzer {
     void destroyFilters();
     void storeIfGreater(float* pDest, float source);
 
-    mutable AnalysisDao m_analysisDao;
+    AnalysisDao* m_pAnalysisDao;
 
     bool m_skipProcessing;