inject default working pulseaudio configuration, close bug #308697

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 63 insertions, 3 deletions

diff --git a/media-plugins/alsa-plugins/ChangeLog b/media-plugins/alsa-plugins/ChangeLog
index 68c366faef10..964abe5a83e4 100644
--- a/media-plugins/alsa-plugins/ChangeLog
+++ b/media-plugins/alsa-plugins/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/alsa-plugins
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.124 2010/04/16 22:44:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/ChangeLog,v 1.125 2010/05/28 18:41:23 lxnay Exp $
+
+*alsa-plugins-1.0.23-r1 (28 May 2010)
+
+  28 May 2010; Fabio Erculiani <lxnay@gentoo.org>
+  -alsa-plugins-1.0.23.ebuild, +alsa-plugins-1.0.23-r1.ebuild,
+  +files/pulse.conf, +files/pulse-alsa.conf:
+  inject default working pulseaudio configuration, close bug #308697
 
 *alsa-plugins-1.0.23 (16 Apr 2010)
 
diff --git a/media-plugins/alsa-plugins/alsa-plugins-1.0.23.ebuild b/media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild
index 950854d8b48c..2d1c274e94f5 100644
--- a/media-plugins/alsa-plugins/alsa-plugins-1.0.23.ebuild
+++ b/media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.23.ebuild,v 1.1 2010/04/16 22:44:22 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/alsa-plugins/alsa-plugins-1.0.23-r1.ebuild,v 1.1 2010/05/28 18:41:23 lxnay Exp $
 
 EAPI=2
 
@@ -77,6 +77,14 @@ src_install() {
 	dodoc upmix.txt vdownmix.txt README-pcm-oss
 	use jack && dodoc README-jack
 	use libsamplerate && dodoc samplerate.txt
-	use pulseaudio && dodoc README-pulse
 	use ffmpeg && dodoc lavcrate.txt a52.txt
+
+	if use pulseaudio; then
+		dodoc README-pulse
+		# install ALSA configuration files
+		# making PA to be used by alsa clients
+		insinto /usr/share/alsa
+		doins "${FILESDIR}"/pulse/*.conf
+	fi
+
 }
diff --git a/media-plugins/alsa-plugins/files/pulse-alsa.conf b/media-plugins/alsa-plugins/files/pulse-alsa.conf
new file mode 100644
index 000000000000..9964f2946772
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/pulse-alsa.conf
@@ -0,0 +1,27 @@
+# This file is referred to by /usr/share/alsa/pulse.conf to set pulseaudio as
+# the default output plugin for applications using alsa when PulseAudio is
+# running.
+
+pcm.!default {
+	type pulse
+}
+
+ctl.!default {
+	type pulse
+}
+
+pcm.pulse {
+        type pulse
+	hint {
+		show {
+			@func refer
+			name defaults.namehint.basic
+		}
+		description "Playback/recording through the PulseAudio sound server"
+	}
+}
+
+ctl.pulse {
+        type pulse
+}
+
diff --git a/media-plugins/alsa-plugins/files/pulse.conf b/media-plugins/alsa-plugins/files/pulse.conf
new file mode 100644
index 000000000000..bc409fe6dba8
--- /dev/null
+++ b/media-plugins/alsa-plugins/files/pulse.conf
@@ -0,0 +1,18 @@
+# PulseAudio alsa plugin configuration file to set the pulseaudio plugin as
+# default output for applications using alsa when pulseaudio is running.
+hook_func.pulse_load_if_running {
+	lib "/usr/lib/alsa-lib/libasound_module_conf_pulse.so"
+	func "conf_pulse_hook_load_if_running"
+}
+
+@hooks [
+	{
+		func pulse_load_if_running
+		files [
+			"/usr/share/alsa/pulse-alsa.conf"
+			"/etc/asound.conf"
+			"~/.asoundrc"
+		]
+		errors false
+	}
+]