.flat_volumes = TRUE,
.exit_idle_time = 20,
.scache_idle_time = 20,
- .auto_log_target = 1,
.script_commands = NULL,
.dl_search_path = NULL,
.load_default_script_file = TRUE,
.default_script_file = NULL,
- .log_target = PA_LOG_SYSLOG,
+ .log_target = NULL,
.log_level = PA_LOG_NOTICE,
.log_backtrace = 0,
.log_meta = FALSE,
.deferred_volume_safety_margin_usec = 8000,
.deferred_volume_extra_delay_usec = 0,
.default_sample_spec = { .format = PA_SAMPLE_S16NE, .rate = 44100, .channels = 2 },
+ .alternate_sample_rate = 48000,
.default_channel_map = { .channels = 2, .map = { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT } },
.shm_size = 0
#ifdef HAVE_SYS_RESOURCE_H
#else
if (pa_run_from_build_tree()) {
pa_log_notice("Detected that we are run from the build tree, fixing search path.");
- c->dl_search_path = pa_xstrdup(PA_BUILDDIR "/.libs/");
+ c->dl_search_path = pa_xstrdup(PA_BUILDDIR);
} else
c->dl_search_path = pa_xstrdup(PA_DLSEARCHPATH);
#endif
void pa_daemon_conf_free(pa_daemon_conf *c) {
pa_assert(c);
- pa_log_set_fd(-1);
-
pa_xfree(c->script_commands);
pa_xfree(c->dl_search_path);
pa_xfree(c->default_script_file);
+
+ if (c->log_target)
+ pa_log_target_free(c->log_target);
+
pa_xfree(c->config_file);
pa_xfree(c);
}
int pa_daemon_conf_set_log_target(pa_daemon_conf *c, const char *string) {
+ pa_log_target *log_target = NULL;
+
pa_assert(c);
pa_assert(string);
- if (!strcmp(string, "auto"))
- c->auto_log_target = 1;
- else if (!strcmp(string, "syslog")) {
- c->auto_log_target = 0;
- c->log_target = PA_LOG_SYSLOG;
- } else if (!strcmp(string, "stderr")) {
- c->auto_log_target = 0;
- c->log_target = PA_LOG_STDERR;
- } else if (pa_startswith(string, "file:")) {
- char file_path[512];
- int log_fd;
-
- pa_strlcpy(file_path, string + 5, sizeof(file_path));
-
- /* Open target file with user rights */
- if ((log_fd = open(file_path, O_RDWR|O_TRUNC|O_CREAT, S_IRUSR | S_IWUSR)) >= 0) {
- c->auto_log_target = 0;
- c->log_target = PA_LOG_FD;
- pa_log_set_fd(log_fd);
- } else {
- printf("Failed to open target file %s, error : %s\n", file_path, pa_cstrerror(errno));
+ if (!pa_streq(string, "auto")) {
+ log_target = pa_log_parse_target(string);
+
+ if (!log_target)
return -1;
- }
- } else
- return -1;
+ }
+
+ c->log_target = log_target;
return 0;
}
pa_assert(c);
pa_assert(string);
- if (!strcmp(string, "user"))
+ if (pa_streq(string, "user"))
c->local_server_type = PA_SERVER_TYPE_USER;
- else if (!strcmp(string, "system")) {
+ else if (pa_streq(string, "system")) {
c->local_server_type = PA_SERVER_TYPE_SYSTEM;
- } else if (!strcmp(string, "none")) {
+ } else if (pa_streq(string, "none")) {
c->local_server_type = PA_SERVER_TYPE_NONE;
} else
return -1;
return 0;
}
-static int parse_log_target(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_log_target(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
+
+ pa_assert(state);
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ c = state->data;
- if (pa_daemon_conf_set_log_target(c, rvalue) < 0) {
- pa_log(_("[%s:%u] Invalid log target '%s'."), filename, line, rvalue);
+ if (pa_daemon_conf_set_log_target(c, state->rvalue) < 0) {
+ pa_log(_("[%s:%u] Invalid log target '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_log_level(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_log_level(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
+
+ pa_assert(state);
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ c = state->data;
- if (pa_daemon_conf_set_log_level(c, rvalue) < 0) {
- pa_log(_("[%s:%u] Invalid log level '%s'."), filename, line, rvalue);
+ if (pa_daemon_conf_set_log_level(c, state->rvalue) < 0) {
+ pa_log(_("[%s:%u] Invalid log level '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_resample_method(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_resample_method(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
+
+ pa_assert(state);
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ c = state->data;
- if (pa_daemon_conf_set_resample_method(c, rvalue) < 0) {
- pa_log(_("[%s:%u] Invalid resample method '%s'."), filename, line, rvalue);
+ if (pa_daemon_conf_set_resample_method(c, state->rvalue) < 0) {
+ pa_log(_("[%s:%u] Invalid resample method '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
}
#ifdef HAVE_SYS_RESOURCE_H
-static int parse_rlimit(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- struct pa_rlimit *r = data;
+static int parse_rlimit(pa_config_parser_state *state) {
+ struct pa_rlimit *r;
+
+ pa_assert(state);
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(r);
+ r = state->data;
- if (rvalue[strspn(rvalue, "\t ")] == 0) {
+ if (state->rvalue[strspn(state->rvalue, "\t ")] == 0) {
/* Empty string */
r->is_set = 0;
r->value = 0;
} else {
int32_t k;
- if (pa_atoi(rvalue, &k) < 0) {
- pa_log(_("[%s:%u] Invalid rlimit '%s'."), filename, line, rvalue);
+ if (pa_atoi(state->rvalue, &k) < 0) {
+ pa_log(_("[%s:%u] Invalid rlimit '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
r->is_set = k >= 0;
}
#endif
-static int parse_sample_format(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_sample_format(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
pa_sample_format_t f;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
+
+ c = state->data;
- if ((f = pa_parse_sample_format(rvalue)) < 0) {
- pa_log(_("[%s:%u] Invalid sample format '%s'."), filename, line, rvalue);
+ if ((f = pa_parse_sample_format(state->rvalue)) < 0) {
+ pa_log(_("[%s:%u] Invalid sample format '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_sample_rate(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_sample_rate(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
uint32_t r;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
- if (pa_atou(rvalue, &r) < 0 || r > (uint32_t) PA_RATE_MAX || r <= 0) {
- pa_log(_("[%s:%u] Invalid sample rate '%s'."), filename, line, rvalue);
+ c = state->data;
+
+ if (pa_atou(state->rvalue, &r) < 0 || r > (uint32_t) PA_RATE_MAX || r <= 0 ||
+ !((r % 4000 == 0) || (r % 11025 == 0))) {
+ pa_log(_("[%s:%u] Invalid sample rate '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
+static int parse_alternate_sample_rate(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
+ uint32_t r;
+
+ pa_assert(state);
+
+ c = state->data;
+
+ if (pa_atou(state->rvalue, &r) < 0 || r > (uint32_t) PA_RATE_MAX || r <= 0 ||
+ !((r % 4000==0) || (r % 11025 == 0))) {
+ pa_log(_("[%s:%u] Invalid sample rate '%s'."), state->filename, state->lineno, state->rvalue);
+ return -1;
+ }
+
+ c->alternate_sample_rate = r;
+ return 0;
+}
+
struct channel_conf_info {
pa_daemon_conf *conf;
pa_bool_t default_sample_spec_set;
pa_bool_t default_channel_map_set;
};
-static int parse_sample_channels(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- struct channel_conf_info *i = data;
+static int parse_sample_channels(pa_config_parser_state *state) {
+ struct channel_conf_info *i;
int32_t n;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
+
+ i = state->data;
- if (pa_atoi(rvalue, &n) < 0 || n > (int32_t) PA_CHANNELS_MAX || n <= 0) {
- pa_log(_("[%s:%u] Invalid sample channels '%s'."), filename, line, rvalue);
+ if (pa_atoi(state->rvalue, &n) < 0 || n > (int32_t) PA_CHANNELS_MAX || n <= 0) {
+ pa_log(_("[%s:%u] Invalid sample channels '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_channel_map(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- struct channel_conf_info *i = data;
+static int parse_channel_map(pa_config_parser_state *state) {
+ struct channel_conf_info *i;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
- if (!pa_channel_map_parse(&i->conf->default_channel_map, rvalue)) {
- pa_log(_("[%s:%u] Invalid channel map '%s'."), filename, line, rvalue);
+ i = state->data;
+
+ if (!pa_channel_map_parse(&i->conf->default_channel_map, state->rvalue)) {
+ pa_log(_("[%s:%u] Invalid channel map '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_fragments(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_fragments(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
int32_t n;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
+
+ c = state->data;
- if (pa_atoi(rvalue, &n) < 0 || n < 2) {
- pa_log(_("[%s:%u] Invalid number of fragments '%s'."), filename, line, rvalue);
+ if (pa_atoi(state->rvalue, &n) < 0 || n < 2) {
+ pa_log(_("[%s:%u] Invalid number of fragments '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_fragment_size_msec(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_fragment_size_msec(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
int32_t n;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
+
+ c = state->data;
- if (pa_atoi(rvalue, &n) < 0 || n < 1) {
- pa_log(_("[%s:%u] Invalid fragment size '%s'."), filename, line, rvalue);
+ if (pa_atoi(state->rvalue, &n) < 0 || n < 1) {
+ pa_log(_("[%s:%u] Invalid fragment size '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_nice_level(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_nice_level(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
int32_t level;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
- if (pa_atoi(rvalue, &level) < 0 || level < -20 || level > 19) {
- pa_log(_("[%s:%u] Invalid nice level '%s'."), filename, line, rvalue);
+ c = state->data;
+
+ if (pa_atoi(state->rvalue, &level) < 0 || level < -20 || level > 19) {
+ pa_log(_("[%s:%u] Invalid nice level '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
return 0;
}
-static int parse_rtprio(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
+static int parse_rtprio(pa_config_parser_state *state) {
+#if !defined(OS_IS_WIN32) && defined(HAVE_SCHED_H)
+ pa_daemon_conf *c;
+ int32_t rtprio;
+#endif
+
+ pa_assert(state);
+
#ifdef OS_IS_WIN32
- pa_log("[%s:%u] Realtime priority not available on win32.", filename, line);
+ pa_log("[%s:%u] Realtime priority not available on win32.", state->filename, state->lineno);
#else
# ifdef HAVE_SCHED_H
- pa_daemon_conf *c = data;
- int32_t rtprio;
-
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ c = state->data;
- if (pa_atoi(rvalue, &rtprio) < 0 || rtprio < sched_get_priority_min(SCHED_FIFO) || rtprio > sched_get_priority_max(SCHED_FIFO)) {
- pa_log("[%s:%u] Invalid realtime priority '%s'.", filename, line, rvalue);
+ if (pa_atoi(state->rvalue, &rtprio) < 0 || rtprio < sched_get_priority_min(SCHED_FIFO) || rtprio > sched_get_priority_max(SCHED_FIFO)) {
+ pa_log("[%s:%u] Invalid realtime priority '%s'.", state->filename, state->lineno, state->rvalue);
return -1;
}
}
#ifdef HAVE_DBUS
-static int parse_server_type(const char *filename, unsigned line, const char *section, const char *lvalue, const char *rvalue, void *data, void *userdata) {
- pa_daemon_conf *c = data;
+static int parse_server_type(pa_config_parser_state *state) {
+ pa_daemon_conf *c;
- pa_assert(filename);
- pa_assert(lvalue);
- pa_assert(rvalue);
- pa_assert(data);
+ pa_assert(state);
- if (pa_daemon_conf_set_local_server_type(c, rvalue) < 0) {
- pa_log(_("[%s:%u] Invalid server type '%s'."), filename, line, rvalue);
+ c = state->data;
+
+ if (pa_daemon_conf_set_local_server_type(c, state->rvalue) < 0) {
+ pa_log(_("[%s:%u] Invalid server type '%s'."), state->filename, state->lineno, state->rvalue);
return -1;
}
{ "resample-method", parse_resample_method, c, NULL },
{ "default-sample-format", parse_sample_format, c, NULL },
{ "default-sample-rate", parse_sample_rate, c, NULL },
+ { "alternate-sample-rate", parse_alternate_sample_rate, c, NULL },
{ "default-sample-channels", parse_sample_channels, &ci, NULL },
{ "default-channel-map", parse_channel_map, &ci, NULL },
{ "default-fragments", parse_fragments, c, NULL },
ci.default_channel_map_set = ci.default_sample_spec_set = FALSE;
ci.conf = c;
- r = f ? pa_config_parse(c->config_file, f, table, NULL) : 0;
+ r = f ? pa_config_parse(c->config_file, f, table, NULL, NULL) : 0;
if (r >= 0) {
pa_strbuf *s;
char cm[PA_CHANNEL_MAP_SNPRINT_MAX];
+ char *log_target = NULL;
pa_assert(c);
pa_assert(c->log_level < PA_LOG_LEVEL_MAX);
+ if (c->log_target)
+ log_target = pa_log_target_to_string(c->log_target);
+
pa_strbuf_printf(s, "daemonize = %s\n", pa_yes_no(c->daemonize));
pa_strbuf_printf(s, "fail = %s\n", pa_yes_no(c->fail));
pa_strbuf_printf(s, "high-priority = %s\n", pa_yes_no(c->high_priority));
pa_strbuf_printf(s, "dl-search-path = %s\n", pa_strempty(c->dl_search_path));
pa_strbuf_printf(s, "default-script-file = %s\n", pa_strempty(pa_daemon_conf_get_default_script_file(c)));
pa_strbuf_printf(s, "load-default-script-file = %s\n", pa_yes_no(c->load_default_script_file));
- pa_strbuf_printf(s, "log-target = %s\n", c->auto_log_target ? "auto" : (c->log_target == PA_LOG_SYSLOG ? "syslog" : "stderr"));
+ pa_strbuf_printf(s, "log-target = %s\n", pa_strempty(log_target));
pa_strbuf_printf(s, "log-level = %s\n", log_level_to_string[c->log_level]);
pa_strbuf_printf(s, "resample-method = %s\n", pa_resample_method_to_string(c->resample_method));
pa_strbuf_printf(s, "enable-remixing = %s\n", pa_yes_no(!c->disable_remixing));
pa_strbuf_printf(s, "enable-lfe-remixing = %s\n", pa_yes_no(!c->disable_lfe_remixing));
pa_strbuf_printf(s, "default-sample-format = %s\n", pa_sample_format_to_string(c->default_sample_spec.format));
pa_strbuf_printf(s, "default-sample-rate = %u\n", c->default_sample_spec.rate);
+ pa_strbuf_printf(s, "alternate-sample-rate = %u\n", c->alternate_sample_rate);
pa_strbuf_printf(s, "default-sample-channels = %u\n", c->default_sample_spec.channels);
pa_strbuf_printf(s, "default-channel-map = %s\n", pa_channel_map_snprint(cm, sizeof(cm), &c->default_channel_map));
pa_strbuf_printf(s, "default-fragments = %u\n", c->default_n_fragments);
#endif
#endif
+ pa_xfree(log_target);
+
return pa_strbuf_tostring_free(s);
}