From 1047af530c00e95877ac915dec6dfae7c5a68db2 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Thu, 5 Mar 2009 16:05:15 -0600
Subject: update soundconfig for new udev

---
 abs/mv-core/MythVantage-config/soundconfig.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/abs/mv-core/MythVantage-config/soundconfig.sh b/abs/mv-core/MythVantage-config/soundconfig.sh
index 1adb447..2f4e67c 100755
--- a/abs/mv-core/MythVantage-config/soundconfig.sh
+++ b/abs/mv-core/MythVantage-config/soundconfig.sh
@@ -7,6 +7,7 @@ BASE=""
 . /etc/profile
 #TEMPLATES="/usr/share/templates"
 TESTFILE="$TEMPLATES/audio/space_battle_A.wav"
+#TESTFILE="/usr/share/sounds/alsa/Front_Center.wav"
 OSSinstalled="false"
 
 function testaudio () {
@@ -21,14 +22,14 @@ function load_alsa() {
 #    cd /lib/modules/2.6.21-STB
     KER=`uname -r`
     cd /lib/modules/$KER/kernel/
-    tar -xvf alsa-$KER.tar
+    tar -xvf /lib/modules/alsa-$KER.tar
     pacman -Sf --noconfirm  alsa-lib
 
     depmod -a
     cd -
-    udevsettle
-    udevsettle
-    udevtrigger
+    udevadm trigger
+    udevadm settle
+    udevadm trigger
 
     add_service.sh alsa-utils
     sleep 4
@@ -57,6 +58,11 @@ function unload_oss {
 
 function installOSS {
     echo "installing oss"
+    pacman -Q oss 2>/dev/null
+    if [  ! $? = 0 ]
+    then
+        pacman --noconfirm -Sf oss
+    fi
     add_service.sh oss
     sleep 4
     sv start oss
@@ -102,7 +108,7 @@ $MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT
 
 
 function checkOSSinstalled () {
- ossinfo 1>/dev/null
+ ossinfo |grep Version |grep -q OSS >/dev/null
  resultcode=$?
  echo $resultcode
  if [ $resultcode = 0 ]
-- 
cgit v0.12