diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-09-17 23:45:28 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-09-17 23:45:28 +0000 |
| commit | 9ad4aa387ebcae2ec2b9f67f1f04eea89eddc241 (patch) | |
| tree | c9a8b1a3c1dc250b86cd59e668a4b714b4d22200 | |
| parent | 0b9bc039f63fb6173fd1b442a22e12c40797bc92 (diff) | |
minor stuff
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@217 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | doc/todo | 2 | ||||
| -rw-r--r-- | polyp/client-conf.c | 1 | ||||
| -rw-r--r-- | polyp/daemon.conf.in | 4 | ||||
| -rw-r--r-- | polyp/polyplib-context.c | 3 |
4 files changed, 5 insertions, 5 deletions
@@ -2,7 +2,6 @@ *** 0.5 *** - more complete pactl/parec -- fix tcp/native in regard to latencies (i.e. latency interpolation) *** 0.6 **** - per-channel volume @@ -12,6 +11,7 @@ - make mcalign merge chunks - option to use default fragment size on alsa drivers - improve module-oss-mmap latency measurement +- new mainloop method: defer_pending() ** later *** - xmlrpc/http diff --git a/polyp/client-conf.c b/polyp/client-conf.c index c43788fe..efaae837 100644 --- a/polyp/client-conf.c +++ b/polyp/client-conf.c @@ -43,7 +43,6 @@ #define ENV_DEFAULT_SERVER "POLYP_SERVER" #define ENV_DAEMON_BINARY "POLYP_BINARY" - static const struct pa_client_conf default_conf = { .daemon_binary = NULL, .extra_arguments = NULL, diff --git a/polyp/daemon.conf.in b/polyp/daemon.conf.in index a277bb4f..e6d82db1 100644 --- a/polyp/daemon.conf.in +++ b/polyp/daemon.conf.in @@ -34,7 +34,7 @@ ## 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 and SCHED_FIFO scheduling on startup. -high-priority = 0 +; high-priority = 0 ## Disallow module loading after startup ; disallow-module-loading = 0 @@ -44,7 +44,7 @@ high-priority = 0 ; exit-idle-time = -1 ## Unload autoloaded modules after being idle for this time -module-idle-time = 20 +; module-idle-time = 20 ## The path were to look for dynamic shared objects (DSOs aka ## plugins). You may specify more than one path seperated by diff --git a/polyp/polyplib-context.c b/polyp/polyplib-context.c index 8f6ce6a8..8a7c719c 100644 --- a/polyp/polyplib-context.c +++ b/polyp/polyplib-context.c @@ -500,7 +500,8 @@ int pa_context_connect(struct pa_context *c, const char *server, int spawn, cons if (!server && spawn && c->conf->autospawn && !default_server_is_running()) return context_connect_spawn(c, api); - server = DEFAULT_SERVER; + if (!server) + server = DEFAULT_SERVER; pa_context_ref(c); |