From 8b6f563c72c2e40aa968602e25f841d90a60314e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Fri, 14 May 2021 23:43:48 +0200
Subject: fix motu-m4 workarounds

---
 chaos-at-home/ch-equinox-t450s.yml | 16 ----------------
 chaos-at-home/ch-equinox-ws.yml    | 25 ++++++++++++++++---------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml
index 767f732e..ed3d1c3a 100644
--- a/chaos-at-home/ch-equinox-t450s.yml
+++ b/chaos-at-home/ch-equinox-t450s.yml
@@ -68,19 +68,3 @@
         else
           echo "Touchpad not found..."
         fi
-
-  - name: force pulseaudio sample rates to 48kHz (workadournd for Motu M4)
-    loop:
-    - default-sample-rate
-    - alternate-sample-rate
-    lineinfile:
-      path: /etc/pulse/daemon.conf
-      regexp: ';?\s*{{ item }} = '
-      line: '{{ item }} = 48000'
-
-  - name: disable USB Powermanagement for Motu M4
-    copy:
-      content: |
-        ## Workaround for spurious audio issues with Motu M4
-        ATTRS{idVendor}=="07fd", ATTRS{idProduct}=="0008", ATTR{power/control}="on", ATTR{power/persist}="0"
-      dest: 90-mout-m4-power.rules
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index 5adfb57f..8feff2cf 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -34,18 +34,25 @@
       opts: nodev,x-systemd.automount,nofail
       state: mounted
 
+  - name: create pulse daemon config directory
+    file:
+      path: /etc/pulse/daemon.conf.d
+      state: directory
+
   - name: force pulseaudio sample rates to 48kHz (workadournd for Motu M4)
-    loop:
-    - default-sample-rate
-    - alternate-sample-rate
-    lineinfile:
-      path: /etc/pulse/daemon.conf
-      regexp: ';?\s*{{ item }} = '
-      line: '{{ item }} = 48000'
+    copy:
+      content: |
+        resample-method = speex-float-10
+        avoid-resampling = false
+
+        default-sample-format = float32le
+        default-sample-rate = 48000
+        alternate-sample-rate = 48000
+      dest: /etc/pulse/daemon.conf.d/motu-m4.conf
 
   - name: disable USB Powermanagement for Motu M4
     copy:
       content: |
-        ## Workaround for spurious audio issues with Motu M4
+        ## workaround for spurious audio issues with Motu M4
         ATTRS{idVendor}=="07fd", ATTRS{idProduct}=="0008", ATTR{power/control}="on", ATTR{power/persist}="0"
-      dest: 90-mout-m4-power.rules
+      dest: /etc/udev/rules.d/90-mout-m4-power.rules
-- 
cgit v1.2.3