From a2121d5e6f33b31481a014012b7eef43b8e500db Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 8 Nov 2007 22:31:30 +0000 Subject: strip most comments from the default configuration files, since the man page is now more elaborate and we don't want to maintain those docs redundantly at two places git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2030 fefdeb5f-60dc-0310-8127-8f9354f1896f --- src/daemon/daemon.conf.in | 87 +++++------------------------------------------ src/pulse/client.conf.in | 29 +++++----------- 2 files changed, 17 insertions(+), 99 deletions(-) diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in index 54acd8ea..f15d93e8 100644 --- a/src/daemon/daemon.conf.in +++ b/src/daemon/daemon.conf.in @@ -17,104 +17,38 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -## Configuration file for the pulseaudio daemon. Default values are -## commented out. Use either ; or # for commenting +## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for +## more information. Default values a commented out. Use either ; or # for +## commenting. -## Daemonize after startup ; daemonize = no - -## Quit if startup fails ; fail = yes +; disallow-module-loading = no +; use-pid-file = yes +; system-instance = no +; disable-shm = no -## Renice the daemon to level -15. This a good idea if you experience -## drop-outs in the playback. However, this is a certain security -## issue, since it works when called SUID root only. root is dropped -## immediately after gaining the nice level on startup, thus it is -## presumably safe. ; high-priority = yes +; nice-level = -11 -## Try to acquire SCHED_FIFO scheduling for the IO threads. The same -## security concerns as mentioned above apply. However, if PA enters -## an endless loop, realtime scheduling causes a system lockup. Thus, -## realtime scheduling should only be enabled on trusted machines for -## now. Please not that only the IO threads of PulseAudio are made -## real-time. The controlling thread is left a normally scheduled -## thread. Thus the enabling the high-priority option is orthogonal. ; realtime-scheduling = no - -## The realtime priority to acquire, if realtime-scheduling is -## enabled. (Note: JACK uses 10 by default, 9 for clients -- some -## PulseAudio threads might choose a priority a little lower or higher -## than this value.) ; realtime-priority = 5 -## The nice level to acquire for the daemon, if high-priority is -## enabled. (Note: on some distributions X11 uses -10 by default.) -; nice-level = -11 - -## Disallow module loading after startup -; disallow-module-loading = no - -## Terminate the daemon after the last client quit and this time -## passed. Use a negative value to disable this feature. ; exit-idle-time = -1 - -## Unload autoloaded modules after being idle for this time ; module-idle-time = 20 - -## Unload autoloaded sample cache entries after being idle for this time ; scache-idle-time = 20 -## The path were to look for dynamic shared objects (DSOs aka -## plugins). You may specify more than one path seperated by -## colons. ; dl-search-path = @PA_DLSEARCHPATH@ -## The default script file to load. Specify an empty string for not -## loading a default script file. The ; default-script-file = @PA_DEFAULT_CONFIG_FILE@ -## The default log target. Use either "stderr", "syslog" or -## "auto". The latter is equivalent to "sylog" in case daemonize is -## true, otherwise to "stderr". ; log-target = auto - -# Log level, one of debug, info, notice, warning, error. Log messages -# with a lower log level than specified here are not logged, ; log-level = notice -## The resampling algorithm to use. Use one of src-sinc-best-quality, -## src-sinc-medium-quality, src-sinc-fastest, src-zero-order-hold, -## src-linear, trivial, speex-float-N, speex-fixed-N, ffmpeg. See the -## documentation of libsamplerate for an explanation for the different -## src- methods. The method 'trivial' is the most basic algorithm -## implemented. If you're tight on CPU consider using this. On the -## other hand it has the worst quality of them all. The speex -## resamplers take an integer quality setting in the range 0..9 -## (bad...good). They exist in two flavours: fixed and float. The -## former uses fixed point numbers, the latter relies on floating -## point numbers. On most desktop CPUs the float point resmapler is a -## lot faster, and it also offers slightly better quality. ; resample-method = speex-float-3 -## Create a PID file in /tmp/pulseaudio-$USER/pid. Of this is enabled -## you may use commands like "pulseaudio --kill" or "pulseaudio -## --check". If you are planning to start more than one pulseaudio -## process per user, you better disable this option since it -## effectively disables multiple instances. -; use-pid-file = yes - -## Do not install the CPU load limit, even on platforms where it is -## supported. This option is useful when debugging/profiling -## PulseAudio to disable disturbing SIGXCPU signals. ; no-cpu-limit = no -## Run the daemon as system-wide instance, requires root priviliges -; system-instance = no - -## Resource limits, see getrlimit(2) for more information. Set to -1 -## if PA shouldn't touch the resource limit. Not all resource limits -## are available on all operating systems. ; rlimit-as = -1 ; rlimit-core = -1 ; rlimit-data = -1 @@ -126,14 +60,9 @@ ; rlimit-nice = 31 ; rlimit-rtprio = 9 -## Disable shared memory data transfer -; disable-shm = no - -## Default sample format ; default-sample-format = s16le ; default-sample-rate = 44100 ; default-sample-channels = 2 -## Default fragment settings, for device drivers that need this ; default-fragments = 4 ; default-fragment-size-msec = 25 diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in index 3cfd9760..2bc8a7c8 100644 --- a/src/pulse/client.conf.in +++ b/src/pulse/client.conf.in @@ -17,29 +17,18 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA. -## Configuration file for pulseaudio clients. Default values are -## commented out. Use either ; or # for commenting +## Configuration file for PulseAudio clients. See pulse-client.conf(5) for +## more information. Default values a commented out. Use either ; or # for +## commenting. -## Path to the pulseaudio daemon to run when autospawning. -; daemon-binary = @PA_BINARY@ - -## Extra arguments to pass to the pulseaudio daemon -; extra-arguments = --log-target=syslog --exit-idle-time=5 - -## The default sink to connect to -; default-sink = - -## The default source to connect to +; default-sink = ; default-source = - -## The default sever to connect to ; default-server = -## Autospawn daemons? -; autospawn = 0 +; autospawn = no +; daemon-binary = @PA_BINARY@ +; extra-arguments = --log-target=syslog --exit-idle-time=5 -### Cookie file -; cookie-file = +; cookie-file = -### Disable shared memory data transfer -; disable-shm = 0 +; disable-shm = no -- cgit