mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-10 13:29:58 -05:00
merge r2179 from prepare-0.9.10
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2180 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
1908e82bea
commit
8298b6b12f
1 changed files with 7 additions and 7 deletions
|
|
@ -80,13 +80,6 @@ load-module module-suspend-on-idle
|
|||
### Load X11 bell module
|
||||
#load-module module-x11-bell sample=x11-bell
|
||||
|
||||
### Publish connection data in the X11 root window
|
||||
.ifexists module-x11-publish@PA_SOEXT@
|
||||
.nofail
|
||||
load-module module-x11-publish
|
||||
.fail
|
||||
.endif
|
||||
|
||||
### Register ourselves in the X11 session manager
|
||||
# Deactivated by default, to avoid deadlock when PA is started as esd from gnome-session
|
||||
# Instead we load this via /etc/xdg/autostart/ and "pactl load-module" now
|
||||
|
|
@ -101,6 +94,13 @@ load-module module-gconf
|
|||
.fail
|
||||
.endif
|
||||
|
||||
### Publish connection data in the X11 root window
|
||||
.ifexists module-x11-publish@PA_SOEXT@
|
||||
.nofail
|
||||
load-module module-x11-publish
|
||||
.fail
|
||||
.endif
|
||||
|
||||
### Make some devices default
|
||||
#set-default-sink output
|
||||
#set-default-source input
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue