Author: lennart
Date: Thu Sep 6 22:38:10 2007
New Revision: 1773
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1773&root=pulseaudio&view=rev
Log:
update default config:
- check for existance of modules before loading them
- disable all event sounds except hotplug by default
Modified:
branches/lennart/src/Makefile.am
branches/lennart/src/daemon/default.pa.in
branches/lennart/src/pulsecore/cli-command.c
Modified: branches/lennart/src/Makefile.am
URL:
http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.am?rev=1773&root=pulseaudio&r1=1772&r2=1773&view=diff
==============================================================================
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Thu Sep 6 22:38:10 2007
@@ -1392,8 +1392,8 @@
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
Modified: branches/lennart/src/daemon/default.pa.in
URL:
http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/default.pa.in?rev=1773&root=pulseaudio&r1=1772&r2=1773&view=diff
==============================================================================
--- branches/lennart/src/daemon/default.pa.in (original)
+++ branches/lennart/src/daemon/default.pa.in Thu Sep 6 22:38:10 2007
@@ -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-module module-pipe-sink
### Automatically load driver modules depending on the hardware available
[EMAIL PROTECTED]@load-module module-hal-detect
-
+.ifexists @PA_DLSEARCHPATH@/[EMAIL PROTECTED]@
+load-module module-hal-detect
+.else
### Alternatively use the static hardware detection module (for systems that
### lack HAL support)
[EMAIL PROTECTED]@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-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@/[EMAIL PROTECTED]@
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 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@/[EMAIL PROTECTED]@
load-module module-gconf
+.endif
### Make some devices default
#set-default-sink output
Modified: branches/lennart/src/pulsecore/cli-command.c
URL:
http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/pulsecore/cli-command.c?rev=1773&root=pulseaudio&r1=1772&r2=1773&view=diff
==============================================================================
--- branches/lennart/src/pulsecore/cli-command.c (original)
+++ branches/lennart/src/pulsecore/cli-command.c Thu Sep 6 22:38:10 2007
@@ -1145,6 +1145,7 @@
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);
_______________________________________________
pulseaudio-commits mailing list
[email protected]
https://tango.0pointer.de/mailman/listinfo/pulseaudio-commits
