pool/pulseaudio
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 122925 from home:tiwai:branches:multimedia:libs

Browse Source 
- Kill leftover PA processes when disabled via setup-pulseaudio
- Set up gstreamer audiosink/src in setup-pulseaudio script, too

OBS-URL: https://build.opensuse.org/request/show/122925
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=90
This commit is contained in:
Takashi Iwai 2012-05-31 09:00:57 +00:00 committed by Git OBS Bridge
parent 254b096f1e
commit adc53efa96
2 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pulseaudio.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed May 30 09:49:36 CEST 2012 - tiwai@suse.de
- Kill leftover PA processes when disabled via setup-pulseaudio
- Set up gstreamer audiosink/src in setup-pulseaudio script, too
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 29 13:01:46 CEST 2012 - tiwai@suse.de Tue May 29 13:01:46 CEST 2012 - tiwai@suse.de

41
setup-pulseaudio
View File

@ -57,6 +57,14 @@ delete_variable () {
fi fi
} }
setup_gconf_vendor() {
if [ -x /usr/bin/gconftool-2 ]; then
/usr/bin/gconftool-2 --direct --config-source \
xml:readwrite:/etc/gconf/gconf.xml.vendor \
"$@"
fi
}
enable_phonon() { enable_phonon() {
echo "Enabling PulseAudio for Phonon..." echo "Enabling PulseAudio for Phonon..."
delete_variable PHONON_PULSEAUDIO_DISABLE delete_variable PHONON_PULSEAUDIO_DISABLE
@ -161,6 +169,19 @@ enable_sox() {
set_variable AUDIODRIVER pulseaudio set_variable AUDIODRIVER pulseaudio
} }
enable_gstreamer() {
# set autoaudiosink/src, which should pick up PA
echo "Setting auto sink/src for gstreamer"
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/audiosink autoaudiosink
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/musicaudiosink autoaudiosink
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/chataudiosink autoaudiosink
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/audiosrc autoaudiosrc
}
enable_autospawn() { enable_autospawn() {
echo "Enabling PulseAudio autospawn..." echo "Enabling PulseAudio autospawn..."
if grep -q ^autospawn /etc/pulse/client.conf; then if grep -q ^autospawn /etc/pulse/client.conf; then
@ -246,6 +267,18 @@ disable_sox() {
set_variable AUDIODRIVER alsa set_variable AUDIODRIVER alsa
} }
disable_gstreamer() {
echo "Setting alsasink/src for gstreamer"
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/audiosink alsasink
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/musicaudiosink alsasink
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/chataudiosink alsasink
setup_gconf_vendor -s -t str \
/system/gstreamer/0.10/default/audiosrc alsasrc
}
disable_autospawn() { disable_autospawn() {
echo "Disabling PulseAudio autospawn..." echo "Disabling PulseAudio autospawn..."
if grep -q ^autospawn /etc/pulse/client.conf; then if grep -q ^autospawn /etc/pulse/client.conf; then
@ -253,6 +286,8 @@ disable_autospawn() {
else else
echo "autospawn = no" >> /etc/pulse/client.conf echo "autospawn = no" >> /etc/pulse/client.conf
fi fi
# kill leftover PA processes
killall pulseaudio > /dev/null 2>&1
} }
enable_all() { enable_all() {
@ -265,10 +300,11 @@ enable_all() {
enable_timidity enable_timidity
enable_xine enable_xine
enable_festival enable_festival
enable_autospawn
enable_phonon enable_phonon
enable_speechd enable_speechd
enable_sox enable_sox
enable_gstreamer
enable_autospawn
} }
disable_all() { disable_all() {
@ -281,10 +317,11 @@ disable_all() {
disable_timidity disable_timidity
disable_xine disable_xine
disable_festival disable_festival
disable_autospawn
disable_phonon disable_phonon
disable_speechd disable_speechd
disable_sox disable_sox
disable_gstreamer
disable_autospawn
} }
case $1 in case $1 in