From fbc1110d8f2b2c9fec36d89b6ee6c3aa57caac56 Mon Sep 17 00:00:00 2001
From: razorkitty <razorkitty@null.net>
Date: Sat, 19 Nov 2022 21:30:54 +0000
Subject: [PATCH] replace pactl based volume control with mpris based volume
 control methods

---
 pkg/player/pactl.go  | 16 ----------------
 pkg/player/player.go | 40 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 16 deletions(-)
 delete mode 100644 pkg/player/pactl.go

diff --git a/pkg/player/pactl.go b/pkg/player/pactl.go
deleted file mode 100644
index 3dc3441..0000000
--- a/pkg/player/pactl.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package player
-
-import (
-	"fmt"
-	"os/exec"
-)
-
-// VolUp uses pactl to increase the volume of the default sink
-func VolUp(percent uint) error {
-	return exec.Command("pactl", "set-sink-volume", "@DEFAULT_SINK@", fmt.Sprintf("+%d%%", percent)).Run()
-}
-
-// VolDown uses pactl to decrease the volume of the default sink
-func VolDown(percent uint) error {
-	return exec.Command("pactl", "set-sink-volume", "@DEFAULT_SINK@", fmt.Sprintf("-%d%%", percent)).Run()
-}
diff --git a/pkg/player/player.go b/pkg/player/player.go
index 6f3e202..5358a80 100644
--- a/pkg/player/player.go
+++ b/pkg/player/player.go
@@ -107,6 +107,46 @@ func Prev() error {
 	return nil
 }
 
+func VolUp(percent uint) error {
+
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+                currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
+                if err != nil {
+                    return err
+                }
+                newVal := currentVal.Value().(float64) + (float64(percent) / 100)
+                err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
+                if err != nil {
+                    return err
+                }
+        }
+	return nil
+}
+
+func VolDown(percent uint) error {
+
+	player, err := getPlayerObj()
+	if err != nil {
+		return err
+	}
+	if player != nil {
+                currentVal, err := player.GetProperty("org.mpris.MediaPlayer2.Player.Volume")
+                if err != nil {
+                    return err
+                }
+                newVal := currentVal.Value().(float64) - (float64(percent) / 100)
+                err = player.SetProperty("org.mpris.MediaPlayer2.Player.Volume", newVal)
+                if err != nil {
+                    return err
+                }
+        }
+	return nil
+}
+
 type ChangeType int
 
 const (