Balance

3 files changed, 20 insertions, 5 deletions

diff --git a/bragi.nix b/bragi.nix
index 3e0abc1f..dc732626 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -210,11 +210,11 @@ in rec {
     "outnode0" = { initial = "1"; adjustable = false; };
     "outnode1" = { initial = "1"; adjustable = false; };
 
-    "headphones0" = { connectOut = "system:playback_3"; connectIn = "outnode0:out"; group = "headphones"; initial = "1"; };
-    "headphones1" = { connectOut = "system:playback_4"; connectIn = "outnode1:out"; group = "headphones"; initial = "1"; };
+    "headphones0" = { connectOut = "system:playback_3"; connectIn = "outnode0:out"; group = "headphones"; initial = "1"; balance = "right"; };
+    "headphones1" = { connectOut = "system:playback_4"; connectIn = "outnode1:out"; group = "headphones"; initial = "1"; balance = "left"; };
 
-    "speakers0" = { connectOut = "system:playback_7"; connectIn = "outnode0:out"; group = "speakers"; initial = "0"; };
-    "speakers1" = { connectOut = "system:playback_8"; connectIn = "outnode1:out"; group = "speakers"; initial = "0"; };
+    "speakers0" = { connectOut = "system:playback_7"; connectIn = "outnode0:out"; group = "speakers"; initial = "0"; balance = "right"; };
+    "speakers1" = { connectOut = "system:playback_8"; connectIn = "outnode1:out"; group = "speakers"; initial = "0"; balance = "left"; };
   };
 
   services.mpd = {
diff --git a/custom/trivmix b/custom/trivmix
-Subproject 31a88f4dd0800caeeb56d785b1876a9c2b88fb9
+Subproject 72dfd7bdb13e71c04604c0458582960259ec8fb
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index 9ebf02f1..f2d549fe 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -39,6 +39,18 @@ let
         description = "Volumes of mixers that share a group name are synchronised";
       };
 
+      balance = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        description = "Volumes of mixers are multiplied with their balances, this is the name of the file that contains the factor for this mixer";
+      };
+
+      initialBalance = mkOption {
+        type = types.str;
+        default = "1";
+        description = "Initial balance";
+      };
+
       initial = mkOption {
         type = types.str;
         default = "1";
@@ -60,8 +72,11 @@ let
 
     mixerDeps = filter (x: any (hasPrefix (x + ":")) connectIn || any (hasPrefix (x + ":")) connectOut) (attrNames cfg);
 
-    trivmixArgs = [ "--client" name "--level" initial ]
+    trivmixArgs = let
+        dirName = if isNull group then name else group;
+      in [ "--client" name "--level" initial "--initial-balance" initialBalance]
                ++ optionals connect ["--run" connectScript] 
+               ++ optionals (adjustable && (! isNull balance)) ["--balance" "/dev/shm/mix/${dirName}/${balance}"]
                ++ optional (adjustable && isNull group) "/dev/shm/mix/${name}/level"
                ++ optional (! isNull group) "/dev/shm/mix/${group}/level";
   in {