mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
merge r2134 from trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2177 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
e5e9ed6d72
commit
2b593d2fca
1 changed files with 6 additions and 0 deletions
|
|
@ -46,7 +46,9 @@ load-module module-detect
|
|||
.endif
|
||||
|
||||
### Load several protocols
|
||||
.ifexists module-esound-protocol-unix@PA_SOEXT@
|
||||
load-module module-esound-protocol-unix
|
||||
.endif
|
||||
load-module module-native-protocol-unix
|
||||
|
||||
### Network access (may be configured with paprefs, so leave this commented
|
||||
|
|
@ -80,7 +82,9 @@ load-module module-suspend-on-idle
|
|||
|
||||
### 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
|
||||
|
|
@ -92,7 +96,9 @@ load-module module-x11-publish
|
|||
### Please keep in mind that the modules configured by paprefs might conflict with manually
|
||||
### loaded modules.
|
||||
.ifexists module-gconf@PA_SOEXT@
|
||||
.nofail
|
||||
load-module module-gconf
|
||||
.fail
|
||||
.endif
|
||||
|
||||
### Make some devices default
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue