mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-07 13:30:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

update default config:

Browse source 
- 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
This commit is contained in:
Lennart Poettering 2007-09-06 20:38:10 +00:00
parent b1fd53b20b
commit 3b2cf1ade5
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Makefile.am
View file

@ -1392,8 +1392,8 @@ default.pa: daemon/default.pa.win32
else else
default.pa: daemon/default.pa.in Makefile default.pa: daemon/default.pa.in Makefile
sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \ sed -e 's,@PA_BINARY\@,$(PA_BINARY),g' \
-e 's,@HAVE_HAL_TRUE\@,@HAVE_HAL_TRUE@,g' \ -e 's,@PA_DLSEARCHPATH\@,$(modlibexecdir),g' \
-e 's,@HAVE_HAL_FALSE\@,@HAVE_HAL_FALSE@,g' < $< > $@ -e 's,@PA_SOEXT\@,.so,g' < $< > $@
endif endif
daemon.conf: daemon/daemon.conf.in Makefile daemon.conf: daemon/daemon.conf.in Makefile

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

@ -19,10 +19,10 @@
.nofail .nofail
### Load something into the sample cache ### Load something into the sample cache
load-sample-lazy x11-bell /usr/share/sounds/gtk-events/activate.wav #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-hotplug /usr/share/sounds/startup3.wav
load-sample-lazy pulse-coldplug /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 #load-sample-lazy pulse-access /usr/share/sounds/generic.wav
.fail .fail
@ -37,11 +37,13 @@ load-sample-lazy pulse-access /usr/share/sounds/generic.wav
#load-module module-pipe-sink #load-module module-pipe-sink
### Automatically load driver modules depending on the hardware available ### 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 ### Alternatively use the static hardware detection module (for systems that
### lack HAL support) ### lack HAL support)
@HAVE_HAL_FALSE@load-module module-detect load-module module-detect
.endif
### Load several protocols ### Load several protocols
load-module module-esound-protocol-unix load-module module-esound-protocol-unix
@ -74,10 +76,12 @@ load-module module-rescue-streams
load-module module-suspend-on-idle load-module module-suspend-on-idle
### Load X11 bell module ### 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 ### Publish connection data in the X11 root window
.ifexists @PA_DLSEARCHPATH@/module-x11-publish@PA_SOEXT@
load-module module-x11-publish load-module module-x11-publish
.endif
### Register ourselves in the X11 session manager ### Register ourselves in the X11 session manager
# Deactivated by default, to avoid deadlock when PA is started as esd from gnome-session # 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. ### 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 ### Please keep in mind that the modules configured by paprefs might conflict with manually
### loaded modules. ### loaded modules.
.ifexists @PA_DLSEARCHPATH@/module-gconf@PA_SOEXT@
load-module module-gconf load-module module-gconf
.endif
### Make some devices default ### Make some devices default
#set-default-sink output #set-default-sink output

1
src/pulsecore/cli-command.c
View file

@ -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); const char *filename = cs+l+strspn(cs+l, whitespace);
*ifstate = access(filename, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE; *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 { } else {
pa_strbuf_printf(buf, "Invalid meta command: %s\n", cs); pa_strbuf_printf(buf, "Invalid meta command: %s\n", cs);