| 1 |
commit: a54994b75a31daeadd55861255b2e50e8246db43 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 12 02:12:53 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 1 02:46:14 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/livecd-tools.git;a=commit;h=a54994b7 |
| 7 |
|
| 8 |
update sound and software speech handling |
| 9 |
|
| 10 |
migrate unmute code to a separate script. Also migrate the espeakup |
| 11 |
service to the list_services function. |
| 12 |
|
| 13 |
--- |
| 14 |
autoconfig | 47 +++++------------------------------------------ |
| 15 |
unmute | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ |
| 16 |
2 files changed, 54 insertions(+), 42 deletions(-) |
| 17 |
|
| 18 |
diff --git a/autoconfig b/autoconfig |
| 19 |
index 06be5f1..32fff56 100755 |
| 20 |
--- a/autoconfig |
| 21 |
+++ b/autoconfig |
| 22 |
@@ -257,6 +257,11 @@ list_services() { |
| 23 |
|
| 24 |
local svcs="$(check_svc ${ACPI} acpid)" |
| 25 |
svcs="${svcs} $(check_svc ${ALSA} alsasound)" |
| 26 |
+ svcs="${svcs} $(check_svc ${ALSA} unmute)" |
| 27 |
+ if [ "${SPEAKUP_MODULE}" = "speakup_soft" ] && rc-service -e espeakup |
| 28 |
+ then |
| 29 |
+ svcs="${svcs} espeakup" |
| 30 |
+ fi |
| 31 |
svcs="${svcs} $(check_svc ${APM} apmd)" |
| 32 |
svcs="${svcs} $(check_svc ${BRLTTY} brltty)" |
| 33 |
svcs="${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)" |
| 34 |
@@ -588,48 +593,6 @@ start() { |
| 35 |
&& einfo " ${WARN}${SOUND_FULLNAME} " |
| 36 |
[ -n "${SOUND_DRIVER}" ] \ |
| 37 |
&& einfo " driver = ${SOUND_DRIVER}" |
| 38 |
- |
| 39 |
- if [ -e /proc/asound/cards ] |
| 40 |
- then |
| 41 |
- for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]]) |
| 42 |
- do |
| 43 |
- if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ] |
| 44 |
- then |
| 45 |
- amixer -c $i scontrols > /etc/amixer |
| 46 |
- [ -n "$(grep Master /etc/amixer)" ] \ |
| 47 |
- && amixer -c $i -q set Master 95% unmute \ |
| 48 |
- >/dev/null 2>&1 |
| 49 |
- [ -n "$(grep Front /etc/amixer)" ] \ |
| 50 |
- && amixer -c $i -q set Front 95% unmute \ |
| 51 |
- >/dev/null 2>&1 |
| 52 |
- [ -n "$(grep HDMI /etc/amixer)" ] \ |
| 53 |
- && amixer -c $i -q set HDMI 95% unmute \ |
| 54 |
- >/dev/null 2>&1 |
| 55 |
- [ -n "$(grep IEC958 /etc/amixer)" ] \ |
| 56 |
- && amixer -c $i -q set IEC958 95% unmute \ |
| 57 |
- >/dev/null 2>&1 |
| 58 |
- [ -n "$(grep PCM /etc/amixer)" ] \ |
| 59 |
- && amixer -c $i -q set PCM 95% unmute \ |
| 60 |
- >/dev/null 2>&1 |
| 61 |
- [ -n "$(grep Speaker /etc/amixer)" ] \ |
| 62 |
- && amixer -c $i -q set Speaker 95% unmute \ |
| 63 |
- >/dev/null 2>&1 |
| 64 |
- [ -n "$(grep Mic /etc/amixer)" ] \ |
| 65 |
- && amixer -c $i -q set Mic 95% mute cap \ |
| 66 |
- >/dev/null 2>&1 |
| 67 |
- [ -n "$(grep Wave /etc/amixer)" ] \ |
| 68 |
- && amixer -c $i -q set Wave 95% unmute \ |
| 69 |
- >/dev/null 2>&1 |
| 70 |
- [ -n "$(grep Capture /etc/amixer)" ] \ |
| 71 |
- && amixer -c $i -q set Capture 95% unmute cap \ |
| 72 |
- >/dev/null 2>&1 |
| 73 |
- fi |
| 74 |
- done |
| 75 |
- |
| 76 |
- if [ "${SPEAKUP_MODULE}" = "speakup_soft" ] |
| 77 |
- then |
| 78 |
- rc-service -i espeakup start |
| 79 |
- fi |
| 80 |
fi |
| 81 |
fi |
| 82 |
else |
| 83 |
|
| 84 |
diff --git a/unmute b/unmute |
| 85 |
new file mode 100755 |
| 86 |
index 0000000..7e73c83 |
| 87 |
--- /dev/null |
| 88 |
+++ b/unmute |
| 89 |
@@ -0,0 +1,49 @@ |
| 90 |
+#!/sbin/runscript |
| 91 |
+ |
| 92 |
+depend() |
| 93 |
+{ |
| 94 |
+ need alsasound |
| 95 |
+} |
| 96 |
+ |
| 97 |
+start() |
| 98 |
+{ |
| 99 |
+ if [ -e /proc/asound/cards ] |
| 100 |
+ then |
| 101 |
+ for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:]]) |
| 102 |
+ do |
| 103 |
+ einfo "unmuting sound card $i" |
| 104 |
+ if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ] |
| 105 |
+ then |
| 106 |
+ amixer -c $i scontrols > /etc/amixer |
| 107 |
+ [ -n "$(grep Master /etc/amixer)" ] \ |
| 108 |
+ && amixer -c $i -q set Master 95% unmute \ |
| 109 |
+ >/dev/null 2>&1 |
| 110 |
+ [ -n "$(grep Front /etc/amixer)" ] \ |
| 111 |
+ && amixer -c $i -q set Front 95% unmute \ |
| 112 |
+ >/dev/null 2>&1 |
| 113 |
+ [ -n "$(grep HDMI /etc/amixer)" ] \ |
| 114 |
+ && amixer -c $i -q set HDMI 95% unmute \ |
| 115 |
+ >/dev/null 2>&1 |
| 116 |
+ [ -n "$(grep IEC958 /etc/amixer)" ] \ |
| 117 |
+ && amixer -c $i -q set IEC958 95% unmute \ |
| 118 |
+ >/dev/null 2>&1 |
| 119 |
+ [ -n "$(grep PCM /etc/amixer)" ] \ |
| 120 |
+ && amixer -c $i -q set PCM 95% unmute \ |
| 121 |
+ >/dev/null 2>&1 |
| 122 |
+ [ -n "$(grep Speaker /etc/amixer)" ] \ |
| 123 |
+ && amixer -c $i -q set Speaker 95% unmute \ |
| 124 |
+ >/dev/null 2>&1 |
| 125 |
+ [ -n "$(grep Mic /etc/amixer)" ] \ |
| 126 |
+ && amixer -c $i -q set Mic 95% mute cap \ |
| 127 |
+ >/dev/null 2>&1 |
| 128 |
+ [ -n "$(grep Wave /etc/amixer)" ] \ |
| 129 |
+ && amixer -c $i -q set Wave 95% unmute \ |
| 130 |
+ >/dev/null 2>&1 |
| 131 |
+ [ -n "$(grep Capture /etc/amixer)" ] \ |
| 132 |
+ && amixer -c $i -q set Capture 95% unmute cap \ |
| 133 |
+ >/dev/null 2>&1 |
| 134 |
+ fi |
| 135 |
+ done |
| 136 |
+ fi |
| 137 |
+ return 0 |
| 138 |
+} |
Archives