Added restore function to restore the mixer levels without restarting ALSA entirely. Thanks to Robin Johnson in bug #115500.

Package-Manager: portage-2.0.53

3 files changed, 18 insertions, 9 deletions

diff --git a/media-sound/alsa-utils/ChangeLog b/media-sound/alsa-utils/ChangeLog
index 33c6caa7721f..898dc98a2d00 100644
--- a/media-sound/alsa-utils/ChangeLog
+++ b/media-sound/alsa-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/alsa-utils
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.121 2005/11/23 19:14:21 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/ChangeLog,v 1.122 2005/12/15 22:42:46 flameeyes Exp $
+
+  15 Dec 2005; Diego Pettenò <flameeyes@gentoo.org>
+  files/alsasound-1.0.10_rc2:
+  Added restore function to restore the mixer levels without restarting ALSA
+  entirely. Thanks to Robin Johnson in bug #115500.
 
   23 Nov 2005; Luis Medinas <metalgod@gentoo.org> alsa-utils-1.0.10.ebuild:
   Stable on amd64. See bug #111968.
diff --git a/media-sound/alsa-utils/Manifest b/media-sound/alsa-utils/Manifest
index 30af635c3ad9..02c12eb7c3f2 100644
--- a/media-sound/alsa-utils/Manifest
+++ b/media-sound/alsa-utils/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 295aa9267e351826da23483a5681bb68 ChangeLog 18528
+MD5 82b9eed57b6630ae2f00d3ce15af7cab ChangeLog 18742
 MD5 1b85b334459a87cebe65f1a04a5f30af alsa-utils-1.0.10.ebuild 2421
 MD5 8e9e89032a9705095a4f28b1034d05cd alsa-utils-1.0.10_rc2.ebuild 2588
 MD5 13f8ee3120f13e393a218955f2b3ac62 alsa-utils-1.0.10_rc3.ebuild 2582
@@ -14,7 +14,7 @@ MD5 6945018085dd4204d2f26490fb7b50b6 files/alsa-utils-1.0.10_rc1-largefile.patch
 MD5 4d2059fdfeeafe53e5d42692d9c2f14e files/alsa-utils-1.0.10_rc1-nls.patch 1959
 MD5 504c2047f55a094833631892ab099ada files/alsa-utils-1.0.9a-strsignal.patch 454
 MD5 2a50971b115f63d74d0054c7e3ee9144 files/alsasound 7106
-MD5 9224c89a555eeabd60baff541b5996b2 files/alsasound-1.0.10_rc2 7150
+MD5 6e3b02ef9e95e47eb339f6a3d0d91daa files/alsasound-1.0.10_rc2 7183
 MD5 f4f492c382b243ebf558809a372fd6b7 files/alsasound.confd 515
 MD5 a86ec4a87712d028c83f9066f4505551 files/digest-alsa-utils-1.0.10 70
 MD5 5583841a2a5a206ad2838524c2cc7528 files/digest-alsa-utils-1.0.10_rc2 73
@@ -25,9 +25,9 @@ MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a 70
 MD5 2bfc6eaf49d769272a46ed2046b73944 files/digest-alsa-utils-1.0.9a-r1 70
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDhL9jwUpWvClEHQoRAm9vAKCGmDgV8czSmlYIAyAQpQhGQlmKKwCfZmmE
-++RPkTP9p+7Ta//QgJsetME=
-=JIzV
+iD8DBQFDofFyAiZjviIA2XgRAiTCAKDs/ng6YtTrYHxLgv2PyC7ZpPFd4gCfRTNq
+OfHzLt0RZgBnzJJz2NX42yE=
+=7iyc
 -----END PGP SIGNATURE-----
diff --git a/media-sound/alsa-utils/files/alsasound-1.0.10_rc2 b/media-sound/alsa-utils/files/alsasound-1.0.10_rc2
index dfe51b71454d..5403489ebe53 100644
--- a/media-sound/alsa-utils/files/alsasound-1.0.10_rc2
+++ b/media-sound/alsa-utils/files/alsasound-1.0.10_rc2
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-1.0.10_rc2,v 1.1 2005/10/31 18:39:21 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsa-utils/files/alsasound-1.0.10_rc2,v 1.2 2005/12/15 22:42:46 flameeyes Exp $
 #
 # Gentoo users: add this script to 'boot' run level.
 # ==================================================
@@ -50,7 +50,7 @@ asoundcfg=/etc/asound.state
 aconnect=/usr/bin/aconnect
 alsascrdir=/etc/alsa.d
 
-opts="${opts} save"
+opts="${opts} save restore"
 
 depend() {
 	need bootmisc localmount
@@ -166,7 +166,11 @@ restore_mixer() {
 	if [[ ${RESTORE_ON_START} == "no" ]] ; then
 		return 0
 	fi
+	
+	restore
+}
 
+restore() {
 	ebegin "Restoring Mixer Levels"
 
 	local val=0