From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QGMk6-0007rZ-Ki for garchives@archives.gentoo.org; Sun, 01 May 2011 02:50:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C90111C06E; Sun, 1 May 2011 02:49:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 822DF1C06D for ; Sun, 1 May 2011 02:49:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 197731B4071 for ; Sun, 1 May 2011 02:49:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7C77A80507 for ; Sun, 1 May 2011 02:49:09 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/livecd-tools:master commit in: / X-VCS-Repository: proj/livecd-tools X-VCS-Files: autoconfig unmute X-VCS-Directories: / X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: a54994b75a31daeadd55861255b2e50e8246db43 Date: Sun, 1 May 2011 02:49:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 49e32def1cb97a22016ab3d1964804c3 commit: a54994b75a31daeadd55861255b2e50e8246db43 Author: William Hubbs gentoo org> AuthorDate: Sat Feb 12 02:12:53 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun May 1 02:46:14 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/livecd-tools.= git;a=3Dcommit;h=3Da54994b7 update sound and software speech handling migrate unmute code to a separate script. Also migrate the espeakup service to the list_services function. --- autoconfig | 47 +++++------------------------------------------ unmute | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/autoconfig b/autoconfig index 06be5f1..32fff56 100755 --- a/autoconfig +++ b/autoconfig @@ -257,6 +257,11 @@ list_services() { =20 local svcs=3D"$(check_svc ${ACPI} acpid)" svcs=3D"${svcs} $(check_svc ${ALSA} alsasound)" + svcs=3D"${svcs} $(check_svc ${ALSA} unmute)" + if [ "${SPEAKUP_MODULE}" =3D "speakup_soft" ] && rc-service -e espeaku= p + then + svcs=3D"${svcs} espeakup" + fi svcs=3D"${svcs} $(check_svc ${APM} apmd)" svcs=3D"${svcs} $(check_svc ${BRLTTY} brltty)" svcs=3D"${svcs} $(check_svc ${COLDPLUG} coldplug hotplug)" @@ -588,48 +593,6 @@ start() { && einfo " ${WARN}${SOUND_FULLNAME} " [ -n "${SOUND_DRIVER}" ] \ && einfo " driver =3D ${SOUND_DRIVER}" - - if [ -e /proc/asound/cards ] - then - for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digi= t:]]) - do - if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ] - then - amixer -c $i scontrols > /etc/amixer - [ -n "$(grep Master /etc/amixer)" ] \ - && amixer -c $i -q set Master 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep Front /etc/amixer)" ] \ - && amixer -c $i -q set Front 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep HDMI /etc/amixer)" ] \ - && amixer -c $i -q set HDMI 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep IEC958 /etc/amixer)" ] \ - && amixer -c $i -q set IEC958 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep PCM /etc/amixer)" ] \ - && amixer -c $i -q set PCM 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep Speaker /etc/amixer)" ] \ - && amixer -c $i -q set Speaker 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep Mic /etc/amixer)" ] \ - && amixer -c $i -q set Mic 95% mute cap \ - >/dev/null 2>&1 - [ -n "$(grep Wave /etc/amixer)" ] \ - && amixer -c $i -q set Wave 95% unmute \ - >/dev/null 2>&1 - [ -n "$(grep Capture /etc/amixer)" ] \ - && amixer -c $i -q set Capture 95% unmute cap \ - >/dev/null 2>&1 - fi - done - - if [ "${SPEAKUP_MODULE}" =3D "speakup_soft" ] - then - rc-service -i espeakup start - fi fi fi else diff --git a/unmute b/unmute new file mode 100755 index 0000000..7e73c83 --- /dev/null +++ b/unmute @@ -0,0 +1,49 @@ +#!/sbin/runscript + +depend() +{ + need alsasound +} + +start() +{ + if [ -e /proc/asound/cards ] + then + for i in $(cat /proc/asound/cards | awk '{print $1}' | grep ^[[:digit:= ]]) + do + einfo "unmuting sound card $i" + if [ -d /proc/asound/card$i ] && [ -x /usr/bin/amixer ] + then + amixer -c $i scontrols > /etc/amixer + [ -n "$(grep Master /etc/amixer)" ] \ + && amixer -c $i -q set Master 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep Front /etc/amixer)" ] \ + && amixer -c $i -q set Front 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep HDMI /etc/amixer)" ] \ + && amixer -c $i -q set HDMI 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep IEC958 /etc/amixer)" ] \ + && amixer -c $i -q set IEC958 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep PCM /etc/amixer)" ] \ + && amixer -c $i -q set PCM 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep Speaker /etc/amixer)" ] \ + && amixer -c $i -q set Speaker 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep Mic /etc/amixer)" ] \ + && amixer -c $i -q set Mic 95% mute cap \ + >/dev/null 2>&1 + [ -n "$(grep Wave /etc/amixer)" ] \ + && amixer -c $i -q set Wave 95% unmute \ + >/dev/null 2>&1 + [ -n "$(grep Capture /etc/amixer)" ] \ + && amixer -c $i -q set Capture 95% unmute cap \ + >/dev/null 2>&1 + fi + done + fi + return 0 +}