diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-11-20 16:23:53 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-11-20 16:23:53 +0000 |
commit | 5f647c8fef33f35210d550ad1477ef43520b32a3 (patch) | |
tree | c6eb28bbbca0966dede1d7635f67b471fef06924 /polyp/daemon-conf.c | |
parent | 8641af3c6d11e3e6710cb946e9a93d0e9f639519 (diff) |
* add µlaw/alaw support
* abstracted resampler API
* add integer-only resampler ("trivial")
* show used resampler wherever useful
* add mixing/volume adjusting for float32ne and u8
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@294 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/daemon-conf.c')
-rw-r--r-- | polyp/daemon-conf.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/polyp/daemon-conf.c b/polyp/daemon-conf.c index c0ff02f9..191e8d81 100644 --- a/polyp/daemon-conf.c +++ b/polyp/daemon-conf.c @@ -28,13 +28,13 @@ #include <string.h> #include <assert.h> #include <unistd.h> -#include <samplerate.h> #include "daemon-conf.h" #include "util.h" #include "xmalloc.h" #include "strbuf.h" #include "conf-parser.h" +#include "resampler.h" #ifndef DEFAULT_CONFIG_DIR #define DEFAULT_CONFIG_DIR "/etc/polypaudio" @@ -64,7 +64,7 @@ static const struct pa_daemon_conf default_conf = { .dl_search_path = NULL, .default_script_file = NULL, .log_target = PA_LOG_SYSLOG, - .resample_method = SRC_SINC_FASTEST, + .resample_method = PA_RESAMPLER_SRC_SINC_FASTEST, .config_file = NULL, }; @@ -214,14 +214,6 @@ int pa_daemon_conf_env(struct pa_daemon_conf *c) { char *pa_daemon_conf_dump(struct pa_daemon_conf *c) { struct pa_strbuf *s = pa_strbuf_new(); - static const char const* resample_methods[] = { - "sinc-best-quality", - "sinc-medium-quality", - "sinc-fastest", - "zero-order-hold", - "linear" - }; - if (c->config_file) pa_strbuf_printf(s, "### Read from configuration file: %s ###\n", c->config_file); @@ -238,7 +230,7 @@ char *pa_daemon_conf_dump(struct pa_daemon_conf *c) { 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_strbuf_printf(s, "resample-method = %s\n", pa_resample_method_to_string(c->resample_method)); return pa_strbuf_tostring_free(s); } |