From bc9d6b1fe19fa67bc441babe9a924dbcf993a250 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 11 Dec 2015 15:25:04 +0100
Subject: [alsa] force usage of the non-HDMI sound card if we have more than
 one

---
 .../alsa/data/opt/openslx/scripts/alsa-default_card  | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'remote/modules/alsa/data/opt/openslx/scripts')

diff --git a/remote/modules/alsa/data/opt/openslx/scripts/alsa-default_card b/remote/modules/alsa/data/opt/openslx/scripts/alsa-default_card
index ebdf6043..1e28aa4c 100755
--- a/remote/modules/alsa/data/opt/openslx/scripts/alsa-default_card
+++ b/remote/modules/alsa/data/opt/openslx/scripts/alsa-default_card
@@ -12,7 +12,7 @@ if [ -w "/etc" ]; then
 elif [ -n "$HOME" ]; then
 	FILE="${HOME}/.asoundrc"
 else
-	FILE="$(/usr/bin/getent passwd root | awk -F ':' '{print $6}')/.asoundrc"
+	FILE="$(getent passwd root | awk -F ':' '{print $6}')/.asoundrc"
 fi
 
 if [ -e "${FILE}" -a "x$1" != "x--force" ]; then
@@ -31,17 +31,11 @@ if [ -z "${CARD}" ]; then
 fi
 
 cat > "${FILE}" <<HEREDOC
-pcm.!default {
-	type hw
-	card $CARD
-}
-ctl.!default {
-	type hw
-	card $CARD
-}
-timer.!default {
-	type hw
-	card $CARD
-}
+defaults.pcm.!card $CARD
+defaults.ctl.!card $CARD
+
+defaults.pcm.!device 0
+defaults.ctl.!device 0
+
 HEREDOC
 
-- 
cgit v1.2.3-55-g7522