diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-09-17 20:06:17 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-09-17 20:06:17 +0000 |
| commit | f0779587478f5c4012dc5c9debc8dc562c81f967 (patch) | |
| tree | f84fd604efb796a1a999d44734fe8abd14c67d76 /polyp/main.c | |
| parent | 24f378150766faf50445427d6eb02f363a9afc24 (diff) | |
rename some stuff
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@212 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/main.c')
| -rw-r--r-- | polyp/main.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/polyp/main.c b/polyp/main.c index 3b25a030e..107743881 100644 --- a/polyp/main.c +++ b/polyp/main.c @@ -45,7 +45,7 @@ #include "xmalloc.h" #include "cpulimit.h" #include "log.h" -#include "conf.h" +#include "daemon-conf.h" #include "dumpmodules.h" static struct pa_mainloop *mainloop; @@ -90,7 +90,7 @@ static void close_pipe(int p[2]) { int main(int argc, char *argv[]) { struct pa_core *c; struct pa_strbuf *buf = NULL; - struct pa_conf *conf; + struct pa_daemon_conf *conf; char *s; int r, retval = 1, d = 0; int daemon_pipe[2] = { -1, -1 }; @@ -100,11 +100,14 @@ int main(int argc, char *argv[]) { pa_log_set_ident("polypaudio"); - conf = pa_conf_new(); + conf = pa_daemon_conf_new(); - if (pa_conf_load(conf, NULL) < 0) + if (pa_daemon_conf_load(conf, NULL) < 0) goto finish; + if (pa_daemon_conf_env(conf) < 0) + goto finish; + if (pa_cmdline_parse(conf, argc, argv, &d) < 0) { pa_log(__FILE__": failed to parse command line.\n"); goto finish; @@ -127,7 +130,7 @@ int main(int argc, char *argv[]) { goto finish; case PA_CMD_DUMP_CONF: { - char *s = pa_conf_dump(conf); + char *s = pa_daemon_conf_dump(conf); fputs(s, stdout); pa_xfree(s); retval = 0; @@ -261,7 +264,7 @@ int main(int argc, char *argv[]) { finish: if (conf) - pa_conf_free(conf); + pa_daemon_conf_free(conf); close_pipe(daemon_pipe); |