Update of /cvsroot/alsa/alsa-driver/utils
In directory sc8-pr-cvs1:/tmp/cvs-serv26567/utils

Modified Files:
        alsaconf 
Log Message:
- check the snd_ prefix before setting device options.
- cut the name of the card displayed in the list.



Index: alsaconf
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/utils/alsaconf,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- alsaconf    11 Feb 2003 15:51:55 -0000      1.3
+++ alsaconf    17 Mar 2003 16:18:47 -0000      1.4
@@ -96,6 +96,16 @@
     esac
 done
 
+#
+# check the snd_ prefix for ALSA module options
+# snd_ prefix is obsoleted since 0.9.0rc4.
+#
+if modinfo -p snd | grep -q snd_ ; then
+  mpfx="snd_"
+else
+  mpfx=""
+fi
+
 alsa_device_opts=""
 if [ x"$alsa_uid" != x0 ]; then
     alsa_device_opts="$alsa_device_opts ${mpfx}device_uid=$alsa_uid"
@@ -118,16 +128,6 @@
   touch /etc/modules.conf
 fi
 
-#
-# check the snd_ prefix for ALSA module options
-# snd_ prefix is obsoleted since 0.9.0rc4.
-#
-if modinfo -p snd | grep -q snd_ ; then
-  mpfx="snd_"
-else
-  mpfx=""
-fi
-
 # Check for dialog, whiptail, gdialog, awk, ... ?
 if which dialog > /dev/null; then
   DIALOG=dialog
@@ -780,7 +780,7 @@
     return 1
 }
 
-# check if the option $2 exists in card �1: set value $3
+# check if the option $2 exists in card $1: set value $3
 ac_check_option () {
     if modinfo -p snd-$1 | grep $2 > /dev/null 2>&1 ; then
       echo "$2=$3"
@@ -995,7 +995,7 @@
 if [ -s "$FOUND" ]; then
     while read dev card ; do
        /sbin/modprobe -a -l | grep $card'\.o' >/dev/null 2>&1 || continue
-       cardname=`find_device_name $dev`
+       cardname=`find_device_name $dev | cut -c 1-64`
        if [ -z "$cardname" ]; then
            cardname="$card"
        fi



-------------------------------------------------------
This SF.net email is sponsored by:Crypto Challenge is now open! 
Get cracking and register here for some mind boggling fun and 
the chance of winning an Apple iPod:
http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0031en
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to