From 10118c59ec1dc72f510d1b81c3e0a30866096e90 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Tue, 9 Jun 2015 22:36:24 +0200
Subject: new trivmix config with groups

---
 bragi.nix                  | 12 ++++++------
 custom/trivmix-service.nix |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/bragi.nix b/bragi.nix
index a4ef67ab..6672274f 100644
--- a/bragi.nix
+++ b/bragi.nix
@@ -96,14 +96,14 @@
     };
   };
 
-  systemd.services."mpdmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; }).out;
-  systemd.services."mpdmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; }).out;
+  systemd.services."mpdmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix0"; connectOut = "system:playback_3"; group = "mpd"; }).out;
+  systemd.services."mpdmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "mpdmix1"; connectOut = "system:playback_4"; group = "mpd"; }).out;
 
-  systemd.services."passmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; }).out;
-  systemd.services."passmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; }).out;
+  systemd.services."passmix0" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix0"; connectOut = "system:playback_3"; connectIn = "system:capture_5"; group = "vali_out"; }).out;
+  systemd.services."passmix1" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix1"; connectOut = "system:playback_4"; connectIn = "system:capture_6"; group = "vali_out"; }).out;
 
-  systemd.services."passmix2" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; }).out;
-  systemd.services."passmix3" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; }).out;
+  systemd.services."passmix2" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix2"; connectOut = "system:playback_5"; connectIn = "system:capture_1"; group = "vali_in"; }).out;
+  systemd.services."passmix3" = (pkgs.callPackage ./custom/trivmix-service.nix { name = "passmix3"; connectOut = "system:playback_6"; connectIn = "system:capture_1"; group = "vali_in"; }).out;
 
   services.mpd = {
     enable = true;
diff --git a/custom/trivmix-service.nix b/custom/trivmix-service.nix
index ba65ba0a..c9840c35 100644
--- a/custom/trivmix-service.nix
+++ b/custom/trivmix-service.nix
@@ -2,6 +2,7 @@
 , run ? null
 , connectOut ? null
 , connectIn ? null
+, group ? null
 , trivmix
 , stdenv
 , makeWrapper
@@ -36,7 +37,7 @@ in rec {
     requires = [ "jack.service" ];
     serviceConfig = {
       Type = "simple";
-      ExecStart = "${trivmix}/bin/trivmix --client ${name} --run ${genRun} --dir /dev/shm/${name}";
+      ExecStart = "${trivmix}/bin/trivmix --client ${name} --run ${genRun} --level /dev/shm/mix/${name}/level${if ! isNull group then \" --dir /dev/shm/mix/${group}/level\" else \"\"}";
       User = "jack";
       Group = "audio";
     };
-- 
cgit v1.2.3