Make mp3_get_file_info() static.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 693577794627c83c5e369164c76a075eb6375d56..7afff93e263630da1a3692b7ca4b9f28c50fa973 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -275,7 +275,7 @@ static void open_filters(int slot_num)
                return;
        PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
        s->fc = para_calloc(sizeof(struct filter_chain));
-       s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_chain));
+       s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_node));
        s->fc->inbuf = s->receiver_node->buf;
        s->fc->in_loaded = &s->receiver_node->loaded;
        s->fc->input_error = &s->receiver_node->task.error;
@@ -383,8 +383,7 @@ static int receiver_running(int format)
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
-               if (s->format == format && s->receiver_node
-                               && s->receiver_node->task.error >= 0)
+               if (s->format == format && s->receiver_node)
                        return 1;
        }
        return 0;
@@ -757,13 +756,12 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = container_of(t, struct signal_task, task);
-       int signum;
 
        if (!FD_ISSET(st->fd, &s->rfds))
                return;
 
-       signum = para_next_signal();
-       switch (signum) {
+       st->signum = para_next_signal();
+       switch (st->signum) {
        case SIGINT:
        case SIGTERM:
        case SIGHUP:
@@ -1031,22 +1029,27 @@ int main(int argc, char *argv[])
 {
        char *config_file;
        int ret, i;
-       struct sched s;
+       static struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
+       struct audiod_cmdline_parser_params params = {
+               .override = 0,
+               .initialize = 1,
+               .check_required = 0,
+               .check_ambiguity = 0,
+               .print_errors = 1
+       };
 
        valid_fd_012();
-       audiod_cmdline_parser(argc, argv, &conf);
+       audiod_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("audiod", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
        config_file = configfile_exists();
        if (config_file) {
-               struct audiod_cmdline_parser_params params = {
-                       .override = 0,
-                       .initialize = 0,
-                       .check_required = 0,
-                       .check_ambiguity = 0
-
-               };
+               params.override = 0;
+               params.initialize = 0;
+               params.check_required = 1;
+               params.check_ambiguity = 0;
+               params.print_errors = 1;
                if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
                        PARA_EMERG_LOG("parse error in config file\n");
                        exit(EXIT_FAILURE);