summaryrefslogtreecommitdiff
path: root/package/alsa-utils
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-16 14:34:49 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-16 14:34:49 +0200
commitb2c9a66e24f94f3f9e9602baeb8925e0db5fb306 (patch)
tree5539756a40daca29a3215376c85ef9d0797ade4c /package/alsa-utils
parent998bb7ac652581d6ef3a5821aa8dcb6a3a95ecdb (diff)
parentf6dd446a3d030a424ff25e1213ab7d55abdcd86d (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/alsa-utils')
-rw-r--r--package/alsa-utils/Makefile2
-rw-r--r--package/alsa-utils/files/alsa-utils.postinst4
-rw-r--r--package/alsa-utils/files/amixer.init10
3 files changed, 10 insertions, 6 deletions
diff --git a/package/alsa-utils/Makefile b/package/alsa-utils/Makefile
index 8013ee5aa..e1668520c 100644
--- a/package/alsa-utils/Makefile
+++ b/package/alsa-utils/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
PKG_NAME:= alsa-utils
PKG_VERSION:= 1.0.22
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_MD5SUM:= f7180316188552ee1e6759a03f1fe98d
PKG_DESCR:= ALSA mixer utility
PKG_SECTION:= multimedia
diff --git a/package/alsa-utils/files/alsa-utils.postinst b/package/alsa-utils/files/alsa-utils.postinst
index bd4ff3be2..0c381ff14 100644
--- a/package/alsa-utils/files/alsa-utils.postinst
+++ b/package/alsa-utils/files/alsa-utils.postinst
@@ -1,5 +1,5 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf amixer
-add_rcconf amixer_volume amixer_volume "75%"
-add_rcconf amixer_mixer amixer_mixer "Master"
+add_rcconf amixer_volume amixer_volume "80%"
+add_rcconf amixer_mixer amixer_mixer "Master PCM"
diff --git a/package/alsa-utils/files/amixer.init b/package/alsa-utils/files/amixer.init
index 7f5f37177..f5c21b8c3 100644
--- a/package/alsa-utils/files/amixer.init
+++ b/package/alsa-utils/files/amixer.init
@@ -10,11 +10,15 @@ autostart)
exec sh $0 start
;;
start)
- amixer set $amixer_mixer on
- amixer set $amixer_mixer $amixer_volume
+ for mixer in $amixer_mixer; do
+ amixer set $mixer on
+ amixer set $mixer $amixer_volume
+ done
;;
stop)
- amixer set $amixer_mixer off
+ for mixer in $amixer_mixer; do
+ amixer set $mixer off
+ done
;;
restart)
sh $0 stop