From 5bc535583fb61dae9f009e55ad89e184c3444a02 Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Sun, 16 Mar 2025 16:12:17 +0100
Subject: [PATCH] consistent player volume adjustment (#953 and #1160)

in freaking 2 lines
---
 .config/ags/modules/bar/normal/music.js    | 15 +++------------
 .config/ags/scripts/music/adjust-volume.sh | 15 ---------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100755 .config/ags/scripts/music/adjust-volume.sh

diff --git a/.config/ags/modules/bar/normal/music.js b/.config/ags/modules/bar/normal/music.js
index 99cdb589..eb9f2227 100644
--- a/.config/ags/modules/bar/normal/music.js
+++ b/.config/ags/modules/bar/normal/music.js
@@ -27,18 +27,9 @@ function trimTrackTitle(title) {
 }
 
 function adjustVolume(direction) {
-    const step = 0.03; 
-    execAsync(['playerctl', 'volume'])
-        .then((output) => {
-            let currentVolume = parseFloat(output.trim());
-            let newVolume = direction === 'up' ? currentVolume + step : currentVolume - step;
-
-            if (newVolume > 1.0) newVolume = 1.0;
-            if (newVolume < 0.0) newVolume = 0.0;
-
-            execAsync(['playerctl', 'volume', newVolume.toFixed(2)]).catch(print);
-        })
-        .catch(print);
+    const step = 0.1; // We use a larger step because this is player instance volume, not global
+    const mpris = Mpris.getPlayer('');
+    mpris.volume += (direction === 'up') ? step : -step
 }
 
 
diff --git a/.config/ags/scripts/music/adjust-volume.sh b/.config/ags/scripts/music/adjust-volume.sh
deleted file mode 100755
index dce14199..00000000
--- a/.config/ags/scripts/music/adjust-volume.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-change=$1
-
-current_volume=$(playerctl volume)
-
-new_volume=$(echo "$current_volume + $change" | bc)
-
-if (( $(echo "$new_volume > 1.0" | bc -l) )); then
-  new_volume=1.0
-elif (( $(echo "$new_volume < 0.0" | bc -l) )); then
-  new_volume=0.0
-fi
-
-playerctl volume "$new_volume"