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-08 17:59:20 (GMT)
committer Daniel Drake <dsd@laptop.org>2013-03-08 17:59:20 (GMT)
commite9013f35db2f5484ccf75755fa4a62dece483fa5 (patch)
tree4c6412ed56649ea64abfa7a2666d84d8df714dfc
parent437e0e3ad0cd0df45d4ae8f54f3b050b2b3740a3 (diff)
xo4: enable dmix and dsnoop (#12487, #12606)
Fixes Distance and any situation where we might need to do simultaneous playback and similar things.
-rw-r--r--modules/xo4/kspost.50.xo4-tweaks.inc27
1 files changed, 27 insertions, 0 deletions
diff --git a/modules/xo4/kspost.50.xo4-tweaks.inc b/modules/xo4/kspost.50.xo4-tweaks.inc
index d72f834..d1f8e9d 100644
--- a/modules/xo4/kspost.50.xo4-tweaks.inc
+++ b/modules/xo4/kspost.50.xo4-tweaks.inc
@@ -10,3 +10,30 @@ ln -sf /lib/systemd/system/serial-getty@.service \
# FIXME: remove this once XO-4 bluetooth works better
touch /runin/no-bluetooth
echo "blacklist btmrvl_sdio" > /etc/modprobe.d/btmrvl.conf
+
+# enable dmix and dsnoop software sound mixing (#12487, #12606)
+# FIXME: this should be upstreamed (perhaps in a different form)
+cat <<'EOF' > /usr/share/alsa/cards/OLPC_XO-1_75.conf
+# default with dmix/dsnoop
+OLPC_XO-1_75.pcm.default {
+ @args [ CARD ]
+ @args.CARD {
+ type string
+ }
+ type asym
+ playback.pcm {
+ type plug
+ slave.pcm {
+ @func concat
+ strings [ "dmix:CARD=" $CARD ]
+ }
+ }
+ capture.pcm {
+ type plug
+ slave.pcm {
+ @func concat
+ strings [ "dsnoop:CARD=" $CARD ]
+ }
+ }
+}
+EOF