plugin/ac: not singleton

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

1 files changed, 41 insertions, 9 deletions

diff --git a/plugin/src/Caelestia/beattracker.cpp b/plugin/src/Caelestia/beattracker.cpp
index a23d052..501739f 100644
--- a/plugin/src/Caelestia/beattracker.cpp
+++ b/plugin/src/Caelestia/beattracker.cpp
@@ -6,20 +6,52 @@
 
 namespace caelestia {
 
-BeatProcessor::BeatProcessor(QObject* parent)
-    : AudioProcessor(parent)
-    , m_tempo(new_aubio_tempo("default", 1024, m_chunkSize, m_sampleRate))
-    , m_in(new_fvec(m_chunkSize))
-    , m_out(new_fvec(2)) {};
+BeatProcessor::BeatProcessor(AudioCollector* collector, QObject* parent)
+    : AudioProcessor(collector, parent)
+    , m_tempo(nullptr)
+    , m_in(nullptr)
+    , m_out(new_fvec(2)) {
+    if (collector) {
+        m_tempo = new_aubio_tempo("default", 1024, collector->chunkSize(), collector->sampleRate());
+        m_in = new_fvec(collector->chunkSize());
+    }
+};
 
 BeatProcessor::~BeatProcessor() {
-    del_aubio_tempo(m_tempo);
-    del_fvec(m_in);
+    if (m_tempo) {
+        del_aubio_tempo(m_tempo);
+    }
+    if (m_in) {
+        del_fvec(m_in);
+    }
     del_fvec(m_out);
 }
 
+void BeatProcessor::setCollector(AudioCollector* collector) {
+    AudioProcessor::setCollector(collector);
+
+    if (m_tempo) {
+        del_aubio_tempo(m_tempo);
+    }
+    if (m_in) {
+        del_fvec(m_in);
+    }
+
+    if (collector) {
+        m_tempo = new_aubio_tempo("default", 1024, collector->chunkSize(), collector->sampleRate());
+        m_in = new_fvec(collector->chunkSize());
+    } else {
+        m_tempo = nullptr;
+        m_in = nullptr;
+    }
+}
+
 void BeatProcessor::process() {
-    AudioCollector::instance()->readChunk(m_in->data, m_chunkSize);
+    if (!m_collector || !m_tempo || !m_in) {
+        return;
+    }
+
+    m_collector->readChunk(m_in->data);
 
     aubio_tempo_do(m_tempo, m_in, m_out);
     if (m_out->data[0] != 0.0f) {
@@ -30,7 +62,7 @@ void BeatProcessor::process() {
 BeatTracker::BeatTracker(QObject* parent)
     : AudioProvider(parent)
     , m_bpm(120) {
-    m_processor = new BeatProcessor();
+    m_processor = new BeatProcessor(m_collector);
     init();
 
     connect(static_cast<BeatProcessor*>(m_processor), &BeatProcessor::beat, this, &BeatTracker::updateBpm);