mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-15 06:59:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge r2132 from trunk

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2175 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:39:10 +00:00
parent 95422a8d21
commit ac82029338
3 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/daemon/daemon.conf.in
View file

@ -38,7 +38,7 @@
; module-idle-time = 20
; scache-idle-time = 20
; dl-search-path = @PA_DLSEARCHPATH@
; dl-search-path = (depends on architecture)
; default-script-file = @PA_DEFAULT_CONFIG_FILE@

6
src/daemon/default.pa.in
View file

@ -37,7 +37,7 @@ load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav
#load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
.ifexists @PA_DLSEARCHPATH@/module-hal-detect@PA_SOEXT@
.ifexists module-hal-detect@PA_SOEXT@
load-module module-hal-detect
.else
### Alternatively use the static hardware detection module (for systems that
@ -79,7 +79,7 @@ load-module module-suspend-on-idle
#load-module module-x11-bell sample=x11-bell
### Publish connection data in the X11 root window
.ifexists @PA_DLSEARCHPATH@/module-x11-publish@PA_SOEXT@
.ifexists module-x11-publish@PA_SOEXT@
load-module module-x11-publish
.endif
@ -91,7 +91,7 @@ load-module module-x11-publish
### Load additional modules from GConf settings. This can be configured with the paprefs tool.
### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules.
.ifexists @PA_DLSEARCHPATH@/module-gconf@PA_SOEXT@
.ifexists module-gconf@PA_SOEXT@
load-module module-gconf
.endif