plugin/ac: not singleton

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

2 files changed, 21 insertions, 18 deletions

diff --git a/services/Audio.qml b/services/Audio.qml
index a0475d0..e638af5 100644
--- a/services/Audio.qml
+++ b/services/Audio.qml
@@ -1,6 +1,7 @@
 pragma Singleton
 
 import qs.config
+import Caelestia
 import Quickshell
 import Quickshell.Services.Pipewire
 
@@ -32,6 +33,9 @@ Singleton {
     readonly property bool sourceMuted: !!source?.audio?.muted
     readonly property real sourceVolume: source?.audio?.volume ?? 0
 
+    readonly property alias cava: cava
+    readonly property alias beatTracker: beatTracker
+
     function setVolume(newVolume: real): void {
         if (sink?.ready && sink?.audio) {
             sink.audio.muted = false;
@@ -73,4 +77,21 @@ Singleton {
     PwObjectTracker {
         objects: [...root.sinks, ...root.sources]
     }
+
+    AudioCollector {
+        id: collector
+    }
+
+    CavaProvider {
+        id: cava
+
+        collector: collector
+        bars: Config.services.visualiserBars
+    }
+
+    BeatTracker {
+        id: beatTracker
+
+        collector: collector
+    }
 }
diff --git a/services/Cava.qml b/services/Cava.qml
deleted file mode 100644
index 3291bcd..0000000
--- a/services/Cava.qml
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma Singleton
-
-import qs.config
-import Caelestia
-import Quickshell
-
-Singleton {
-    id: root
-
-    readonly property alias provider: provider
-    readonly property alias values: provider.values
-
-    CavaProvider {
-        id: provider
-
-        bars: Config.services.visualiserBars
-    }
-}