plugin/ac: not singleton

Also add nodeId prop
BeatTracker not singleton
Move BeatTracker and Cava to Audio service

1 files changed, 14 insertions, 4 deletions

diff --git a/plugin/src/Caelestia/audioprovider.hpp b/plugin/src/Caelestia/audioprovider.hpp
index aa7fb83..c92b965 100644
--- a/plugin/src/Caelestia/audioprovider.hpp
+++ b/plugin/src/Caelestia/audioprovider.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "audiocollector.hpp"
 #include "service.hpp"
-#include <cstdint>
 #include <qqmlintegration.h>
 #include <qtimer.h>
 
@@ -11,14 +11,15 @@ class AudioProcessor : public QObject {
     Q_OBJECT
 
 public:
-    explicit AudioProcessor(QObject* parent = nullptr);
+    explicit AudioProcessor(AudioCollector* collector, QObject* parent = nullptr);
     ~AudioProcessor();
 
     void init();
 
 protected:
-    uint32_t m_sampleRate;
-    uint32_t m_chunkSize;
+    AudioCollector* m_collector;
+
+    Q_INVOKABLE virtual void setCollector(AudioCollector* collector);
 
 private:
     QTimer* m_timer;
@@ -32,11 +33,20 @@ private:
 class AudioProvider : public Service {
     Q_OBJECT
 
+    Q_PROPERTY(AudioCollector* collector READ collector WRITE setCollector NOTIFY collectorChanged)
+
 public:
     explicit AudioProvider(QObject* parent = nullptr);
     ~AudioProvider();
 
+    AudioCollector* collector() const;
+    void setCollector(AudioCollector* collector);
+
+signals:
+    void collectorChanged();
+
 protected:
+    AudioCollector* m_collector;
     AudioProcessor* m_processor;
 
     void init();