diff options
| author | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-09-09 16:31:02 +1000 |
|---|---|---|
| committer | 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> | 2025-09-09 16:31:02 +1000 |
| commit | 6ae1a8e811f72bda251f8718fb148fcb6853bcc4 (patch) | |
| tree | 4b4018628c9cc32a7f43a4a0d17b091eb852db2c /modules | |
| parent | nix: fix build error with libcava (#585) (diff) | |
| download | caelestia-shell-6ae1a8e811f72bda251f8718fb148fcb6853bcc4.tar.gz caelestia-shell-6ae1a8e811f72bda251f8718fb148fcb6853bcc4.tar.bz2 caelestia-shell-6ae1a8e811f72bda251f8718fb148fcb6853bcc4.zip | |
plugin/ac: not singleton
Also add nodeId prop
BeatTracker not singleton
Move BeatTracker and Cava to Audio service
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/background/Visualiser.qml | 4 | ||||
| -rw-r--r-- | modules/dashboard/Media.qml | 9 | ||||
| -rw-r--r-- | modules/dashboard/dash/Media.qml | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/modules/background/Visualiser.qml b/modules/background/Visualiser.qml index a8ada1e..ad726cc 100644 --- a/modules/background/Visualiser.qml +++ b/modules/background/Visualiser.qml @@ -16,7 +16,7 @@ Item { required property Wallpaper wallpaper ServiceRef { - service: Cava.provider + service: Audio.cava } MultiEffect { @@ -65,7 +65,7 @@ Item { id: bar required property int modelData - property real value: Math.max(0, Math.min(1, Cava.values[side.isRight ? modelData : side.count - modelData - 1])) + property real value: Math.max(0, Math.min(1, Audio.cava.values[side.isRight ? modelData : side.count - modelData - 1])) clip: true diff --git a/modules/dashboard/Media.qml b/modules/dashboard/Media.qml index 9d61eb5..163d271 100644 --- a/modules/dashboard/Media.qml +++ b/modules/dashboard/Media.qml @@ -2,7 +2,6 @@ pragma ComponentBehavior: Bound import qs.components import qs.components.effects -import qs.components.misc import qs.components.controls import qs.services import qs.utils @@ -56,11 +55,11 @@ Item { } ServiceRef { - service: Cava.provider + service: Audio.cava } ServiceRef { - service: BeatTracker + service: Audio.beatTracker } Shape { @@ -91,7 +90,7 @@ Item { id: visualiserBar required property int modelData - readonly property real value: Math.max(1e-3, Math.min(1, Cava.values[modelData])) + readonly property real value: Math.max(1e-3, Math.min(1, Audio.cava.values[modelData])) readonly property real angle: modelData * 2 * Math.PI / Config.services.visualiserBars readonly property real magnitude: value * Config.dashboard.sizes.mediaVisualiserSize @@ -530,7 +529,7 @@ Item { height: visualiser.height * 0.75 playing: Players.active?.isPlaying ?? false - speed: BeatTracker.bpm / 300 + speed: Audio.beatTracker.bpm / 300 source: Paths.absolutePath(Config.paths.mediaGif) asynchronous: true fillMode: AnimatedImage.PreserveAspectFit diff --git a/modules/dashboard/dash/Media.qml b/modules/dashboard/dash/Media.qml index f3fbdbe..d4cccc8 100644 --- a/modules/dashboard/dash/Media.qml +++ b/modules/dashboard/dash/Media.qml @@ -1,5 +1,4 @@ import qs.components -import qs.components.misc import qs.services import qs.config import qs.utils @@ -34,7 +33,7 @@ Item { } ServiceRef { - service: BeatTracker + service: Audio.beatTracker } Shape { @@ -214,7 +213,7 @@ Item { anchors.margins: Appearance.padding.large * 2 playing: Players.active?.isPlaying ?? false - speed: BeatTracker.bpm / 300 + speed: Audio.beatTracker.bpm / 300 source: Paths.absolutePath(Config.paths.mediaGif) asynchronous: true fillMode: AnimatedImage.PreserveAspectFit |