From cc12148dac028d0658cb8e85dce6074d0856f32a Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Fri, 18 Feb 2022 12:12:29 +0100
Subject: [PATCH] pkgs: change-audio: 0.2.0 -> 0.3.0

Only boost audio beyond 100% if specifically asked for.
---
 pkgs/change-audio/change-audio | 21 +++++++++++++++++----
 pkgs/change-audio/default.nix  |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/change-audio/change-audio b/pkgs/change-audio/change-audio
index 5bb1588..612fecf 100755
--- a/pkgs/change-audio/change-audio
+++ b/pkgs/change-audio/change-audio
@@ -9,13 +9,26 @@ NOTIFY=(
 )
 
 do_change_volume() {
+    local args=()
+
     if [ "$1" = "up" ]; then
-        upDown="-i"
+        args+=("-i")
     else
-        upDown="-d"
+        args+=("-d")
+    fi
+    shift
+
+    # Do not boost over 100% unless explitily asked for
+    if [ "$1" = "--force" ] || [ "$1" = "-f" ]; then
+        args=("--allow-boost" "${args[@]}")
+        shift
     fi
 
-    pamixer --allow-boost "$upDown" "$2"
+    # Volume
+    args+=("$1")
+
+    pamixer "${args[@]}"
+
     newVolume="$(pamixer --get-volume || true)"
     [ "$(pamixer --get-volume-human)" = "muted" ] && isMuted=true
 
@@ -29,7 +42,7 @@ do_change_volume() {
 }
 
 do_toggle() {
-    args=()
+    local args=()
     if [ "${2:-audio}" = mic ]; then
         args+=(--default-source)
         MSG="Toggled microphone"
diff --git a/pkgs/change-audio/default.nix b/pkgs/change-audio/default.nix
index bf0f45c..d2e76b0 100644
--- a/pkgs/change-audio/default.nix
+++ b/pkgs/change-audio/default.nix
@@ -1,7 +1,7 @@
 { lib, libnotify, makeWrapper, pamixer, shellcheck, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
   pname = "change-audio";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = ./change-audio;