diff options
| author | Lennart Poettering <lennart@poettering.net> | 2007-09-06 20:38:10 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2007-09-06 20:38:10 +0000 |
| commit | 3b2cf1ade56d90c28ace819cf82c88b7d1989182 (patch) | |
| tree | cee6060b1d24c69066bd86d8b40ceb924d9314df /src/daemon | |
| parent | b1fd53b20ba77dab903eb4d83e2b9d1a8d99f2b6 (diff) | |
update default config:
- check for existance of modules before loading them
- disable all event sounds except hotplug by default
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1773 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
| -rwxr-xr-x | src/daemon/default.pa.in | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index fb90aa64..597993c4 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -19,10 +19,10 @@ .nofail ### Load something into the sample cache -load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav -load-sample-lazy pulse-hotplug /usr/share/sounds/email.wav -load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav -load-sample-lazy pulse-access /usr/share/sounds/generic.wav +#load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav +load-sample-lazy pulse-hotplug /usr/share/sounds/startup3.wav +#load-sample-lazy pulse-coldplug /usr/share/sounds/startup3.wav +#load-sample-lazy pulse-access /usr/share/sounds/generic.wav .fail @@ -37,11 +37,13 @@ load-sample-lazy pulse-access /usr/share/sounds/generic.wav #load-module module-pipe-sink ### Automatically load driver modules depending on the hardware available -@HAVE_HAL_TRUE@load-module module-hal-detect - +.ifexists @PA_DLSEARCHPATH@/module-hal-detect@PA_SOEXT@ +load-module module-hal-detect +.else ### Alternatively use the static hardware detection module (for systems that ### lack HAL support) -@HAVE_HAL_FALSE@load-module module-detect +load-module module-detect +.endif ### Load several protocols load-module module-esound-protocol-unix @@ -74,10 +76,12 @@ load-module module-rescue-streams load-module module-suspend-on-idle ### Load X11 bell module -load-module module-x11-bell sample=x11-bell +#load-module module-x11-bell sample=x11-bell ### Publish connection data in the X11 root window +.ifexists @PA_DLSEARCHPATH@/module-x11-publish@PA_SOEXT@ load-module module-x11-publish +.endif ### Register ourselves in the X11 session manager # Deactivated by default, to avoid deadlock when PA is started as esd from gnome-session @@ -87,7 +91,9 @@ 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@ load-module module-gconf +.endif ### Make some devices default #set-default-sink output |