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

diff --git a/src/Makefile.am b/src/Makefile.am
index 51be9d0a25902da8c35dc43949adf4c1ff7d5dc0..b0b3bb24ab3cf0c3afb97ea0e09789a77aecb57d 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1392,8 +1392,8 @@ default.pa: daemon/default.pa.win32
 else
 default.pa: daemon/default.pa.in Makefile
        sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
-           -e 's,@HAVE_HAL_TRUE\@,@HAVE_HAL_TRUE@,g' \
-           -e 's,@HAVE_HAL_FALSE\@,@HAVE_HAL_FALSE@,g' < $< > $@
+            -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
+           -e 's,@PA_SOEXT\@,.so,g' < $< > $@
 endif
 
 daemon.conf: daemon/daemon.conf.in Makefile

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index fb90aa64c1b7e85f8db0e6058e299bda813a9505..597993c4704a00e30fc0f20e5c1f941f5d788757 100755 (executable)
--- 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

diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c
index 0cd1f4834ecd5117486f9e69c10a21537b880c58..79b52d463820f7528d3f9ea28b53395ccc981ca3 100644 (file)
--- a/src/pulsecore/cli-command.c
+++ b/src/pulsecore/cli-command.c
@@ -1145,6 +1145,7 @@ int pa_cli_command_execute_line_stateful(pa_core *c, const char *s, pa_strbuf *b
                     const char *filename = cs+l+strspn(cs+l, whitespace);
 
                     *ifstate = access(filename, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE;
+                    pa_log_debug("Checking for existance of '%s': %s", filename, *ifstate == IFSTATE_TRUE ? "success" : "failure");
                 }
             } else {
                 pa_strbuf_printf(buf, "Invalid meta command: %s\n", cs);