rename some stuff

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@212 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 0 insertions, 231 deletions

diff --git a/polyp/conf.c b/polyp/conf.c
deleted file mode 100644
index efc471af..00000000
--- a/polyp/conf.c
+++ /dev/null
@@ -1,231 +0,0 @@
-/* $Id$ */
-
-/***
-  This file is part of polypaudio.
-
-  polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
-  or (at your option) any later version.
-
-  polypaudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with polypaudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <unistd.h>
-#include <samplerate.h>
-
-#include "conf.h"
-#include "util.h"
-#include "xmalloc.h"
-#include "strbuf.h"
-#include "confparser.h"
-
-#ifndef DEFAULT_SCRIPT_FILE
-#define DEFAULT_SCRIPT_FILE "/etc/polypaudio/default.pa"
-#endif
-
-#ifndef DEFAULT_SCRIPT_FILE_USER
-#define DEFAULT_SCRIPT_FILE_USER ".polypaudio/default.pa"
-#endif
-
-#ifndef DEFAULT_CONFIG_FILE
-#define DEFAULT_CONFIG_FILE "/etc/polypaudio/daemon.conf"
-#endif
-
-#ifndef DEFAULT_CONFIG_FILE_USER
-#define DEFAULT_CONFIG_FILE_USER ".polypaudio/daemon.conf"
-#endif
-
-#define ENV_SCRIPT_FILE "POLYP_SCRIPT"
-#define ENV_CONFIG_FILE "POLYP_CONFIG"
-#define ENV_DL_SEARCH_PATH "POLYP_DLPATH"
-
-static const struct pa_conf default_conf = {
-    .cmd = PA_CMD_DAEMON,
-    .daemonize = 0,
-    .fail = 1,
-    .verbose = 0,
-    .high_priority = 0,
-    .disallow_module_loading = 0,
-    .exit_idle_time = -1,
-    .module_idle_time = 20,
-    .scache_idle_time = 20,
-    .auto_log_target = 1,
-    .script_commands = NULL,
-    .dl_search_path = NULL,
-    .default_script_file = NULL,
-    .log_target = PA_LOG_SYSLOG,
-    .resample_method = SRC_SINC_FASTEST
-};
-
-char* default_file(const char *envvar, const char *global, const char *local) {
-    char *p, *h;
-
-    assert(envvar && global && local);
-
-    if ((p = getenv(envvar)))
-        return pa_xstrdup(p);
-
-    if ((h = getenv("HOME"))) {
-        p = pa_sprintf_malloc("%s/%s", h, local);
-        if (!access(p, F_OK)) 
-            return p;
-        
-        pa_xfree(p);
-    }
-
-    return pa_xstrdup(global);
-}
-
-struct pa_conf* pa_conf_new(void) {
-    struct pa_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
-    c->default_script_file = default_file(ENV_SCRIPT_FILE, DEFAULT_SCRIPT_FILE, DEFAULT_SCRIPT_FILE_USER);
-#ifdef DLSEARCHPATH
-    c->dl_search_path = pa_xstrdup(DLSEARCHPATH);
-#endif
-    return c;
-}
-
-void pa_conf_free(struct pa_conf *c) {
-    assert(c);
-    pa_xfree(c->script_commands);
-    pa_xfree(c->dl_search_path);
-    pa_xfree(c->default_script_file);
-    pa_xfree(c);
-}
-
-int parse_log_target(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) {
-    struct pa_conf *c = data;
-    assert(filename && lvalue && rvalue && data);
-    
-    if (!strcmp(rvalue, "auto"))
-        c->auto_log_target = 1;
-    else if (!strcmp(rvalue, "syslog")) {
-        c->auto_log_target = 0;
-        c->log_target = PA_LOG_SYSLOG;
-    } else if (!strcmp(rvalue, "stderr")) {
-        c->auto_log_target = 0;
-        c->log_target = PA_LOG_STDERR;
-    } else {
-        pa_log(__FILE__": [%s:%u] Invalid log target '%s'.\n", filename, line, rvalue);
-        return -1;
-    }
-
-    return 0;
-}
-
-int parse_resample_method(const char *filename, unsigned line, const char *lvalue, const char *rvalue, void *data, void *userdata) {
-    struct pa_conf *c = data;
-    assert(filename && lvalue && rvalue && data);
-
-    if (!strcmp(rvalue, "sinc-best-quality"))
-        c->resample_method = SRC_SINC_BEST_QUALITY;
-    else if (!strcmp(rvalue, "sinc-medium-quality"))
-        c->resample_method = SRC_SINC_MEDIUM_QUALITY;
-    else if (!strcmp(rvalue, "sinc-fastest"))
-        c->resample_method = SRC_SINC_FASTEST;
-    else if (!strcmp(rvalue, "zero-order-hold"))
-        c->resample_method = SRC_ZERO_ORDER_HOLD;
-    else if (!strcmp(rvalue, "linear"))
-        c->resample_method = SRC_LINEAR;
-    else {
-        pa_log(__FILE__": [%s:%u] Inavalid resample method '%s'.\n", filename, line, rvalue);
-        return -1;
-    }
-
-    return 0;
-}
-
-int pa_conf_load(struct pa_conf *c, const char *filename) {
-    char *def = NULL;
-    int r;
-    
-    const struct pa_config_item table[] = {
-        { "verbose",                 pa_config_parse_bool,    &c->verbose },
-        { "daemonize",               pa_config_parse_bool,    &c->daemonize },
-        { "fail",                    pa_config_parse_bool,    &c->fail },
-        { "high-priority",           pa_config_parse_bool,    &c->high_priority },
-        { "disallow-module-loading", pa_config_parse_bool,    &c->disallow_module_loading },
-        { "exit-idle-time",          pa_config_parse_int,     &c->exit_idle_time },
-        { "module-idle-time",        pa_config_parse_int,     &c->module_idle_time },
-        { "scache-idle-time",        pa_config_parse_int,     &c->scache_idle_time },
-        { "dl-search-path",          pa_config_parse_string,  &c->dl_search_path },
-        { "default-script-file",     pa_config_parse_string,  &c->default_script_file },
-        { "log-target",              parse_log_target,        c },
-        { "resample-method",         parse_resample_method,   c },
-        { NULL,                      NULL,                    NULL },
-    };
-
-    if (!filename)
-        filename = def = default_file(ENV_CONFIG_FILE, DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER);
-    
-    r = pa_config_parse(filename, table, NULL);
-    pa_xfree(def);
-    return r;
-}
-
-int pa_conf_env(struct pa_conf *c) {
-    char *e;
-
-    if ((e = getenv(ENV_DL_SEARCH_PATH))) {
-        pa_xfree(c->dl_search_path);
-        c->dl_search_path = pa_xstrdup(e);
-    }
-    if ((e = getenv(ENV_SCRIPT_FILE))) {
-        pa_xfree(c->default_script_file);
-        c->default_script_file = pa_xstrdup(e);
-    }
-
-    return 0;
-}
-
-char *pa_conf_dump(struct pa_conf *c) {
-    struct pa_strbuf *s = pa_strbuf_new();
-    char *d;
-
-    static const char const* resample_methods[] = {
-        "sinc-best-quality",
-        "sinc-medium-quality",
-        "sinc-fastest",
-        "zero-order-hold",
-        "linear"
-    };
-
-    d = default_file(ENV_CONFIG_FILE, DEFAULT_CONFIG_FILE, DEFAULT_CONFIG_FILE_USER);
-    pa_strbuf_printf(s, "### Default configuration file: %s ###\n", d);
-    
-    pa_strbuf_printf(s, "verbose = %i\n", !!c->verbose);
-    pa_strbuf_printf(s, "daemonize = %i\n", !!c->daemonize);
-    pa_strbuf_printf(s, "fail = %i\n", !!c->fail);
-    pa_strbuf_printf(s, "high-priority = %i\n", !!c->high_priority);
-    pa_strbuf_printf(s, "disallow-module-loading = %i\n", !!c->disallow_module_loading);
-    pa_strbuf_printf(s, "exit-idle-time = %i\n", c->exit_idle_time);
-    pa_strbuf_printf(s, "module-idle-time = %i\n", c->module_idle_time);
-    pa_strbuf_printf(s, "scache-idle-time = %i\n", c->scache_idle_time);
-    pa_strbuf_printf(s, "dl-search-path = %s\n", c->dl_search_path ? c->dl_search_path : "");
-    pa_strbuf_printf(s, "default-script-file = %s\n", c->default_script_file);
-    pa_strbuf_printf(s, "log-target = %s\n", c->auto_log_target ? "auto" : (c->log_target == PA_LOG_SYSLOG ? "syslog" : "stderr"));
-
-    assert(c->resample_method <= 4 && c->resample_method >= 0);
-    pa_strbuf_printf(s, "resample-method = %s\n", resample_methods[c->resample_method]);
-    
-    pa_xfree(d);
-    
-    return pa_strbuf_tostring_free(s);
-}