diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-05-15 23:34:41 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-05-15 23:34:41 +0000 |
| commit | 045c1d602dcba57868845ba3270510593c39480f (patch) | |
| tree | b3d61f180e6fa40f97a80aa3e46d7c910ed7c2a6 /src/daemon/daemon.conf.in | |
| parent | 91f092eadcc5e9075e04ae42df11de28ef5047a8 (diff) | |
merge glitch-free branch back into trunk
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2445 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon/daemon.conf.in')
| -rw-r--r-- | src/daemon/daemon.conf.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in index e4cfb82b..fd35c0f6 100644 --- a/src/daemon/daemon.conf.in +++ b/src/daemon/daemon.conf.in @@ -40,6 +40,7 @@ ; dl-search-path = (depends on architecture) +; load-defaul-script-file = yes ; default-script-file = @PA_DEFAULT_CONFIG_FILE@ ; log-target = auto @@ -50,16 +51,21 @@ ; no-cpu-limit = no -; rlimit-as = -1 -; rlimit-core = -1 -; rlimit-data = -1 ; rlimit-fsize = -1 -; rlimit-nofile = 256 +; rlimit-data = -1 ; rlimit-stack = -1 +; rlimit-core = -1 +; rlimit-as = -1 +; rlimit-rss = -1 ; rlimit-nproc = -1 +; rlimit-nofile = 256 ; rlimit-memlock = -1 +; rlimit-locks = -1 +; rlimit-sigpending = -1 +; rlimit-msgqueue = -1 ; rlimit-nice = 31 ; rlimit-rtprio = 9 +; rlimit-rtttime = 1000000 ; default-sample-format = s16le ; default-sample-rate = 44100 |