Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2013-03-27 14:33:17 (GMT)
committer Daniel Drake <dsd@laptop.org>2013-03-27 14:33:17 (GMT)
commitd55ae1193b5edb391a77a1bb42599e8162c2d947 (patch)
treeb60a9c082e67025e2c1a1409eca092acd74c277d
parent62c83a4d968527ce448bb4a4509d14ae6c4086a5 (diff)
Move XO-1.5 dmix rate change into xo1_5 (#12498)
This configuration tweak is only needed on XO-1.5, and particularly doesn't make sense with the current state of audio on XO-4 where 48000 is currently the only available sample rate. Move this tweak into the xo1_5 module so that it does not affect other platforms.
-rw-r--r--modules/x11/kspost.60.misc.inc3
-rw-r--r--modules/xo1_5/kspost.50.xo15-tweaks.inc3
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/x11/kspost.60.misc.inc b/modules/x11/kspost.60.misc.inc
index 4b91dbd..f5745d5 100644
--- a/modules/x11/kspost.60.misc.inc
+++ b/modules/x11/kspost.60.misc.inc
@@ -1,6 +1,3 @@
-# Workaround an unknown bug where TamTam sound is crackly on XO-1.5 (#9414)
-sed -i -e 's/dmix.rate 48000/dmix.rate 44100/' /usr/share/alsa/alsa.conf
-
# Don't try and autospawn pulseaudio (#9470)
sed -i -e 's/; autospawn = yes/autospawn = no/' /etc/pulse/client.conf
diff --git a/modules/xo1_5/kspost.50.xo15-tweaks.inc b/modules/xo1_5/kspost.50.xo15-tweaks.inc
index b83d40e..1346136 100644
--- a/modules/xo1_5/kspost.50.xo15-tweaks.inc
+++ b/modules/xo1_5/kspost.50.xo15-tweaks.inc
@@ -6,3 +6,6 @@ ln -sf /lib/systemd/system/serial-getty@.service \
mkdir -p /etc/systemd/system/runin.target.wants
ln -sf /lib/systemd/system/serial-getty@.service \
/etc/systemd/system/runin.target.wants/serial-getty@ttyS0.service
+
+# Workaround an unknown bug where TamTam sound is crackly on XO-1.5 (#9414)
+sed -i -e 's/dmix.rate 48000/dmix.rate 44100/' /usr/share/alsa/alsa.conf