[arch-commits] Commit in alsa-utils/trunk (alsa alsa.conf.d)

[Aaron Griffin]

    Date: Tuesday, July 22, 2008 @ 17:47:07
  Author: aaron
Revision: 6024

Replace STATE_FILE with ALSA_ARGS

Modified:
  alsa-utils/trunk/alsa
  alsa-utils/trunk/alsa.conf.d

-------------+
 alsa        |    6 ++----
 alsa.conf.d |    5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

Modified: alsa
===================================================================
--- alsa	2008-07-22 21:03:56 UTC (rev 6023)
+++ alsa	2008-07-22 21:47:07 UTC (rev 6024)
@@ -7,8 +7,7 @@
 case "$1" in
   start)
     stat_busy "Restoring ALSA Levels"
-    STATE_FILE=${STATE_FILE:-/etc/asound.state}
-    /usr/sbin/alsactl --file $STATE_FILE restore
+    /usr/sbin/alsactl $ALSA_ARGS restore
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -30,11 +29,10 @@
     fi
     ;;
   stop)
-    STATE_FILE=${STATE_FILE:-/etc/asound.state}
     SAVE_VOLUME=${SAVE_VOLUME:-yes}
     if [ "$SAVE_VOLUME" == "yes" ]; then
       stat_busy "Saving ALSA Levels"
-      /usr/sbin/alsactl --file $STATE_FILE store
+      /usr/sbin/alsactl $ALSA_ARGS store
     else
       stat_busy "Stopping ALSA"
     fi

Modified: alsa.conf.d
===================================================================
--- alsa.conf.d	2008-07-22 21:03:56 UTC (rev 6023)
+++ alsa.conf.d	2008-07-22 21:47:07 UTC (rev 6024)
@@ -1,5 +1,6 @@
-# Sound card state storage file, containing mixer settings.
-STATE_FILE=/etc/asound.state
+# Arguments for alsactl
+# example: ALSA_ARGS="--file /var/run/alsa-state"
+ALSA_ARGS=""
 
 # Enables powersaving mode for AC97 and hda_intel audio chips.
 # Set to 1 to enable powersaving.