Improve memory mapping.
[paraslash.git] / audiod.c
index 58d6527..fc4ac6f 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1,5 +1,5 @@
 /*
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,12 +7,14 @@
 /** \file audiod.c the paraslash's audio daemon */
 #include <sys/types.h>
 #include <dirent.h>
 /** \file audiod.c the paraslash's audio daemon */
 #include <sys/types.h>
 #include <dirent.h>
+#include <signal.h>
 
 #include "para.h"
 #include "error.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 
 #include "para.h"
 #include "error.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
+#include "ggo.h"
 #include "recv.h"
 #include "filter.h"
 #include "grab_client.cmdline.h"
 #include "recv.h"
 #include "filter.h"
 #include "grab_client.cmdline.h"
@@ -33,7 +35,7 @@ INIT_AUDIOD_ERRLISTS;
 /** define the array containing all supported audio formats */
 const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
 
 /** define the array containing all supported audio formats */
 const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
 
-/** defines how to handle one supported audio format */
+/** Defines how audiod handles one supported audio format. */
 struct audio_format_info {
        /** pointer to the receiver for this audio format */
        struct receiver *receiver;
 struct audio_format_info {
        /** pointer to the receiver for this audio format */
        struct receiver *receiver;
@@ -41,9 +43,9 @@ struct audio_format_info {
        void *receiver_conf;
        /** the number of filters that should be activated for this audio format */
        unsigned int num_filters;
        void *receiver_conf;
        /** the number of filters that should be activated for this audio format */
        unsigned int num_filters;
-       /** pointer to the array of filters to be activated */
-       struct filter **filters;
-       /** pointer to the array of filter configurations */
+       /** Array of filter numbers to be activated. */
+       unsigned *filter_nums;
+       /** Pointer to the array of filter configurations. */
        void **filter_conf;
        /** the number of filters that should be activated for this audio format */
        unsigned int num_writers;
        void **filter_conf;
        /** the number of filters that should be activated for this audio format */
        unsigned int num_writers;
@@ -65,6 +67,9 @@ struct audio_format_info {
 struct slot_info slot[MAX_STREAM_SLOTS];
 
 
 struct slot_info slot[MAX_STREAM_SLOTS];
 
 
+/** The array of status items sent by para_server. */
+char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
+
 /**
  * the current mode of operation of which can be changed by the on/off/cycle
  * commands. It is either, AUDIOD_OFF, AUDIOD_ON or AUDIOD_STANDBY.
 /**
  * the current mode of operation of which can be changed by the on/off/cycle
  * commands. It is either, AUDIOD_OFF, AUDIOD_ON or AUDIOD_STANDBY.
@@ -90,7 +95,7 @@ static struct status_task status_task_struct;
  *
  * \sa struct status_task
  */
  *
  * \sa struct status_task
  */
-struct status_task *stat_task = &status_task_struct;
+static struct status_task *stat_task = &status_task_struct;
 static struct timeval initial_delay_barrier;
 
 /**
 static struct timeval initial_delay_barrier;
 
 /**
@@ -118,19 +123,71 @@ struct command_task {
 int get_audio_format_num(char *name)
 {
        int i;
 int get_audio_format_num(char *name)
 {
        int i;
+
+       while (para_isspace(*name))
+               name++;
        FOR_EACH_AUDIO_FORMAT(i)
                if (!strcmp(name, audio_formats[i]))
                        return i;
        return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
        FOR_EACH_AUDIO_FORMAT(i)
                if (!strcmp(name, audio_formats[i]))
                        return i;
        return -E_UNSUPPORTED_AUDIO_FORMAT;
 }
 
+char *get_time_string(struct timeval *newest_stime)
+{
+       struct timeval diff, adj_stream_start, tmp;
+       int total = 0, use_server_time = 1,
+               length_seconds = stat_task->length_seconds;
+
+       if (!stat_task->playing) {
+               if (length_seconds)
+                       return NULL;
+               return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
+       }
+       if (audiod_status == AUDIOD_OFF)
+               goto out;
+       if (stat_task->sa_time_diff_sign > 0)
+               tv_diff(&stat_task->server_stream_start, &stat_task->sa_time_diff,
+                       &adj_stream_start);
+       else
+               tv_add(&stat_task->server_stream_start, &stat_task->sa_time_diff,
+                       &adj_stream_start);
+       tmp = adj_stream_start;
+       if (newest_stime && audiod_status == AUDIOD_ON) {
+               tv_diff(newest_stime, &adj_stream_start, &diff);
+               if (tv2ms(&diff) < 5000) {
+                       tmp = *newest_stime;
+                       use_server_time = 0;
+               }
+       }
+       tv_diff(now, &tmp, &diff);
+       total = diff.tv_sec + stat_task->offset_seconds;
+       if (total > length_seconds)
+               total = length_seconds;
+       if (total < 0)
+               total = 0;
+out:
+       return make_message(
+               "%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
+               status_item_list[SI_PLAY_TIME],
+               use_server_time? "~" : "",
+               total / 60,
+               total % 60,
+               (length_seconds - total) / 60,
+               (length_seconds - total) % 60,
+               length_seconds? (total * 100 + length_seconds / 2) /
+                       length_seconds : 0,
+               length_seconds / 60,
+               length_seconds % 60
+       );
+}
+
 /**
  * the log function of para_audiod
  *
  * \param ll loglevel
  * \param fmt the format string
  */
 /**
  * the log function of para_audiod
  *
  * \param ll loglevel
  * \param fmt the format string
  */
-void para_log(int ll, const char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
        va_list argp;
        FILE *outfd;
 {
        va_list argp;
        FILE *outfd;
@@ -141,6 +198,8 @@ void para_log(int ll, const char* fmt,...)
 
        if (ll < conf.loglevel_arg)
                return;
 
        if (ll < conf.loglevel_arg)
                return;
+       if (!logfile && conf.daemon_given)
+               return;
        if (!hostname)
                hostname = para_hostname();
        outfd = logfile? logfile : stderr;
        if (!hostname)
                hostname = para_hostname();
        outfd = logfile? logfile : stderr;
@@ -155,16 +214,39 @@ void para_log(int ll, const char* fmt,...)
        va_end(argp);
 }
 
        va_end(argp);
 }
 
-static char *configfile_exists(void)
+static void parse_config_or_die(void)
 {
 {
-       char *home = para_homedir();
-       char *config_file = make_message("%s/.paraslash/audiod.conf",
-               home);
-       free(home);
-       if (file_exists(config_file))
-               return config_file;
+       char *config_file;
+
+       if (conf.config_file_given)
+               config_file = para_strdup(conf.config_file_arg);
+       else {
+               char *home = para_homedir();
+               config_file = make_message("%s/.paraslash/audiod.conf", home);
+               free(home);
+       }
+       if (conf.config_file_given && !file_exists(config_file)) {
+               PARA_EMERG_LOG("can not read config file %s\n", config_file);
+               goto err;
+       }
+       if (config_file) {
+               struct audiod_cmdline_parser_params params = {
+                       .override = 0,
+                       .initialize = 0,
+                       .check_required = 1,
+                       .check_ambiguity = 0,
+                       .print_errors = 1
+               };
+               if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
+                       PARA_EMERG_LOG("parse error in config file\n");
+                       goto err;
+               }
+       }
+       free(config_file);
+       return;
+err:
        free(config_file);
        free(config_file);
-       return NULL;
+       exit(EXIT_FAILURE);
 }
 
 static void setup_signal_handling(void)
 }
 
 static void setup_signal_handling(void)
@@ -194,34 +276,31 @@ static void close_receiver(int slot_num)
        if (s->format < 0 || !s->receiver_node)
                return;
        a = &afi[s->format];
        if (s->format < 0 || !s->receiver_node)
                return;
        a = &afi[s->format];
-       PARA_NOTICE_LOG("closing %s receiver in slot %d (eof = %d)\n",
-               audio_formats[s->format] , slot_num, s->receiver_node->eof);
+       PARA_NOTICE_LOG("closing %s receiver in slot %d\n",
+               audio_formats[s->format], slot_num);
        a->receiver->close(s->receiver_node);
        free(s->receiver_node);
        s->receiver_node = NULL;
 }
 
        a->receiver->close(s->receiver_node);
        free(s->receiver_node);
        s->receiver_node = NULL;
 }
 
-static void kill_all_decoders(void)
+static void kill_all_decoders(int error)
 {
        int i;
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
 {
        int i;
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
-               if (s->wng && !s->wng->eof) {
-                       PARA_INFO_LOG("unregistering writer node group in slot %d\n",
+               if (s->wng && s->wng->task.error >= 0) {
+                       PARA_INFO_LOG("deactivating wng in slot %d\n",
                                i);
                                i);
-                       wng_unregister(s->wng);
-                       s->wng->eof = 1;
+                       s->wng->task.error = error;
                }
                }
-               if (s->fc && !s->fc->eof) {
-                       PARA_INFO_LOG("unregistering filter chain in slot %d\n", i);
-                       unregister_task(&s->fc->task);
-                       s->fc->eof = 1;
+               if (s->fc && s->fc->task.error >= 0) {
+                       PARA_INFO_LOG("deactivatimg filter chain in slot %d\n", i);
+                       s->fc->task.error = error;
                }
                }
-               if (s->receiver_node && !s->receiver_node->eof) {
-                       PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i);
-                       unregister_task(&s->receiver_node->task);
-                       s->receiver_node->eof = 1;
+               if (s->receiver_node && s->receiver_node->task.error >= 0) {
+                       PARA_INFO_LOG("deactivating receiver_node in slot %d\n", i);
+                       s->receiver_node->task.error = error;
                }
        }
 }
                }
        }
 }
@@ -259,18 +338,11 @@ int num_filters(int audio_format_num)
        return afi[audio_format_num].num_filters;
 }
 
        return afi[audio_format_num].num_filters;
 }
 
-static void filter_event_handler(struct task *t)
-{
-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
-       struct filter_chain *fc = t->private_data;
-       fc->eof = 1;
-       unregister_task(t);
-}
-
 static void open_filters(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
        struct audio_format_info *a = &afi[s->format];
 static void open_filters(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
        struct audio_format_info *a = &afi[s->format];
+       struct filter_node *fn;
        int nf = a->num_filters;
        int i;
 
        int nf = a->num_filters;
        int i;
 
@@ -279,43 +351,33 @@ 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));
                return;
        PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
        s->fc = para_calloc(sizeof(struct filter_chain));
-       INIT_LIST_HEAD(&s->fc->filters);
+       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->inbuf = s->receiver_node->buf;
        s->fc->in_loaded = &s->receiver_node->loaded;
-       s->fc->input_eof = &s->receiver_node->eof;
+       s->fc->input_error = &s->receiver_node->task.error;
        s->fc->task.pre_select = filter_pre_select;
        s->fc->task.pre_select = filter_pre_select;
-       s->fc->task.event_handler = filter_event_handler;
-       s->fc->task.private_data = s->fc;
-       s->fc->eof = 0;
+       s->fc->task.post_select = NULL;
+       s->fc->task.error = 0;
+       s->fc->num_filters = nf;
 
 
-       s->receiver_node->output_eof = &s->fc->eof;
+       s->receiver_node->output_error = &s->fc->task.error;
        sprintf(s->fc->task.status, "filter chain");
        sprintf(s->fc->task.status, "filter chain");
-       for (i = 0; i < nf; i++) {
-               struct filter_node *fn = para_calloc(sizeof(struct filter_node));
+       FOR_EACH_FILTER_NODE(fn, s->fc, i) {
+               struct filter *f = filters + a->filter_nums[i];
+               fn->filter_num = a->filter_nums[i];
                fn->conf = a->filter_conf[i];
                fn->fc = s->fc;
                fn->conf = a->filter_conf[i];
                fn->fc = s->fc;
-               fn->filter = a->filters[i];
+               fn->loaded = 0;
                INIT_LIST_HEAD(&fn->callbacks);
                INIT_LIST_HEAD(&fn->callbacks);
-               list_add_tail(&fn->node, &s->fc->filters);
-               fn->filter->open(fn);
+               f->open(fn);
                PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
                PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
-                       audio_formats[s->format], i + 1,  nf,
-                       fn->filter->name, slot_num);
+                       audio_formats[s->format], i,  nf, f->name, slot_num);
                s->fc->outbuf = fn->buf;
                s->fc->out_loaded = &fn->loaded;
        }
        register_task(&s->fc->task);
 }
 
                s->fc->outbuf = fn->buf;
                s->fc->out_loaded = &fn->loaded;
        }
        register_task(&s->fc->task);
 }
 
-static void wng_event_handler(struct task *t)
-{
-       struct writer_node_group *wng = t->private_data;
-
-       PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-       wng->eof = 1;
-       wng_unregister(wng);
-}
-
 static void open_writers(int slot_num)
 {
        int ret, i;
 static void open_writers(int slot_num)
 {
        int ret, i;
@@ -330,45 +392,27 @@ static void open_writers(int slot_num)
        if (s->fc) {
                s->wng->buf = s->fc->outbuf;
                s->wng->loaded = s->fc->out_loaded;
        if (s->fc) {
                s->wng->buf = s->fc->outbuf;
                s->wng->loaded = s->fc->out_loaded;
-               s->wng->input_eof = &s->fc->eof;
+               s->wng->input_error = &s->fc->task.error;
                s->wng->channels = &s->fc->channels;
                s->wng->samplerate = &s->fc->samplerate;
                s->wng->channels = &s->fc->channels;
                s->wng->samplerate = &s->fc->samplerate;
-               s->fc->output_eof = &s->wng->eof;
+               s->fc->output_error = &s->wng->task.error;
                PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
        } else {
                s->wng->buf = s->receiver_node->buf;
                s->wng->loaded = &s->receiver_node->loaded;
                PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
        } else {
                s->wng->buf = s->receiver_node->buf;
                s->wng->loaded = &s->receiver_node->loaded;
-               s->wng->input_eof = &s->receiver_node->eof;
+               s->wng->input_error = &s->receiver_node->task.error;
        }
        }
-       s->wng->task.event_handler = wng_event_handler;
        for (i = 0; i < a->num_writers; i++) {
                s->wng->writer_nodes[i].conf = a->writer_conf[i];
                s->wng->writer_nodes[i].writer = a->writers[i];
        }
        ret = wng_open(s->wng);
        if (ret < 0) {
        for (i = 0; i < a->num_writers; i++) {
                s->wng->writer_nodes[i].conf = a->writer_conf[i];
                s->wng->writer_nodes[i].writer = a->writers[i];
        }
        ret = wng_open(s->wng);
        if (ret < 0) {
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                return;
        }
        s->wstime = *now;
                return;
        }
        s->wstime = *now;
-       activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
-}
-
-static void rn_event_handler(struct task *t)
-{
-       struct receiver_node *rn = t->private_data;
-       const struct timeval restart_delay = {0, 10 * 1000};
-       int i;
-
-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
-       unregister_task(t);
-       rn->eof = 1;
-       /* set restart barrier */
-       FOR_EACH_SLOT(i) {
-               if (slot[i].receiver_node != rn)
-                       continue;
-               tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier);
-       }
+       activate_inactive_grab_clients(slot_num, s->format, s->fc);
 }
 
 static int open_receiver(int format)
 }
 
 static int open_receiver(int format)
@@ -377,7 +421,7 @@ static int open_receiver(int format)
        struct slot_info *s;
        int ret, slot_num;
        struct receiver_node *rn;
        struct slot_info *s;
        int ret, slot_num;
        struct receiver_node *rn;
-       const struct timeval restart_delay = {1, 0};
+       const struct timeval restart_delay = {2, 0};
 
        ret = get_empty_slot();
        if (ret < 0)
 
        ret = get_empty_slot();
        if (ret < 0)
@@ -397,15 +441,14 @@ static int open_receiver(int format)
        }
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[s->format], a->receiver->name, slot_num);
        }
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[s->format], a->receiver->name, slot_num);
-       rn->task.private_data = s->receiver_node;
        rn->task.pre_select = a->receiver->pre_select;
        rn->task.post_select = a->receiver->post_select;
        rn->task.pre_select = a->receiver->pre_select;
        rn->task.post_select = a->receiver->post_select;
-       rn->task.event_handler = rn_event_handler;
        sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
        register_task(&rn->task);
        sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
        register_task(&rn->task);
-       return 1;
+       ret = 1;
 err:
 err:
-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       if (ret < 0)
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
        tv_add(now, &restart_delay, &afi[format].restart_barrier);
        return ret;
 }
        tv_add(now, &restart_delay, &afi[format].restart_barrier);
        return ret;
 }
@@ -416,8 +459,7 @@ static int receiver_running(int format)
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
-               if (s->format == format && s->receiver_node
-                               && !s->receiver_node->eof)
+               if (s->format == format && s->receiver_node)
                        return 1;
        }
        return 0;
                        return 1;
        }
        return 0;
@@ -425,23 +467,18 @@ static int receiver_running(int format)
 
 static int open_current_receiver(struct sched *s)
 {
 
 static int open_current_receiver(struct sched *s)
 {
-       int i;
        struct timeval diff;
        struct timeval diff;
-       char *audio_format = stat_task->stat_item_values[SI_FORMAT];
+       int cafn = stat_task->current_audio_format_num;
 
 
-       if (!audio_format || !stat_task->pcd)
+       if (cafn < 0 || !stat_task->ct)
                return 0;
                return 0;
-       i = get_audio_format_num(audio_format + strlen(
-               status_item_list[SI_FORMAT]) + 1);
-       if (i < 0)
+       if (receiver_running(cafn))
                return 0;
                return 0;
-       if (receiver_running(i))
-               return 0;
-       if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) {
+       if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
                s->timeout = diff;
                return 0;
        }
                s->timeout = diff;
                return 0;
        }
-       return open_receiver(i) < 0? 0 : 1;
+       return open_receiver(cafn) < 0? 0 : 1;
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
@@ -493,7 +530,7 @@ static int check_stat_line(char *line, __a_unused void *data)
        long unsigned sec, usec;
        char *tmp;
 
        long unsigned sec, usec;
        char *tmp;
 
-//     PARA_INFO_LOG("line: %s\n", line);
+       //PARA_INFO_LOG("line: %s\n", line);
        if (!line)
                return 1;
        itemnum = stat_line_valid(line);
        if (!line)
                return 1;
        itemnum = stat_line_valid(line);
@@ -506,17 +543,18 @@ static int check_stat_line(char *line, __a_unused void *data)
        tmp = make_message("%s\n", line);
        stat_client_write(tmp, itemnum);
        free(tmp);
        tmp = make_message("%s\n", line);
        stat_client_write(tmp, itemnum);
        free(tmp);
-       free(stat_task->stat_item_values[itemnum]);
-       stat_task->stat_item_values[itemnum] = para_strdup(line);
+       free(stat_item_values[itemnum]);
+       stat_item_values[itemnum] = para_strdup(line);
        ilen = strlen(status_item_list[itemnum]);
        switch (itemnum) {
        case SI_STATUS:
                stat_task->playing = strstr(line, "playing")? 1 : 0;
        ilen = strlen(status_item_list[itemnum]);
        switch (itemnum) {
        case SI_STATUS:
                stat_task->playing = strstr(line, "playing")? 1 : 0;
+               PARA_INFO_LOG("stat task playing: %d\n", stat_task->playing);
                break;
        case SI_OFFSET:
                stat_task->offset_seconds = atoi(line + ilen + 1);
                break;
                break;
        case SI_OFFSET:
                stat_task->offset_seconds = atoi(line + ilen + 1);
                break;
-       case SI_LENGTH:
+       case SI_SECONDS_TOTAL:
                stat_task->length_seconds = atoi(line + ilen + 1);
                break;
        case SI_STREAM_START:
                stat_task->length_seconds = atoi(line + ilen + 1);
                break;
        case SI_STREAM_START:
@@ -542,104 +580,14 @@ static int check_stat_line(char *line, __a_unused void *data)
                        struct timeval tv = {sec, usec};
                        compute_time_diff(&tv);
                }
                        struct timeval tv = {sec, usec};
                        compute_time_diff(&tv);
                }
-               if (stat_task->clock_diff_count)
-                       stat_task->clock_diff_count--;
                break;
                break;
+       case SI_FORMAT:
+               stat_task->current_audio_format_num = get_audio_format_num(
+                       line + ilen + 1);
        }
        return 1;
 }
 
        }
        return 1;
 }
 
-static void try_to_close_slot(int slot_num)
-{
-       struct slot_info *s = &slot[slot_num];
-
-       if (s->format < 0)
-               return;
-       if (s->receiver_node && !s->receiver_node->eof)
-               return;
-       if (s->fc && !s->fc->eof)
-               return;
-       if (s->wng && !s->wng->eof)
-               return;
-       PARA_INFO_LOG("closing slot %d \n", slot_num);
-       wng_close(s->wng);
-       close_filters(s->fc);
-       free(s->fc);
-       close_receiver(slot_num);
-       clear_slot(slot_num);
-}
-
-/*
- * Check if any receivers/filters/writers need to be started and do so if
- * necessary.  Since the pre_select function didn't have a chance yet to put
- * file descriptors into the fd sets given by s, make the upcoming select()
- * return immediately to avoid a long timeout in case we started something.
- */
-static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
-{
-       int i;
-       struct timeval min_delay = {0, 1};
-
-       t->ret = 1;
-       if (audiod_status != AUDIOD_ON || !stat_task->playing)
-               return kill_all_decoders();
-       if (open_current_receiver(s))
-               s->timeout = min_delay;
-       FOR_EACH_SLOT(i) {
-               struct slot_info *sl = &slot[i];
-               struct audio_format_info *a;
-               struct timeval diff;
-
-               if (sl->format < 0)
-                       continue;
-               a = &afi[sl->format];
-               if (!sl->receiver_node)
-                       continue;
-               if (!a->num_filters) {
-                       if (sl->receiver_node->loaded && !sl->wng) {
-                               open_writers(i);
-                               s->timeout = min_delay;
-                       }
-                       continue;
-               }
-               if (sl->receiver_node->loaded && !sl->fc) {
-                       open_filters(i);
-                       s->timeout = min_delay;
-                       continue;
-               }
-               if (!sl->fc || !*sl->fc->out_loaded || sl->wng)
-                       continue;
-               if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
-                       open_writers(i);
-                       s->timeout = min_delay;
-                       continue;
-               }
-               PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
-               if (tv_diff(&s->timeout, &diff, NULL) > 0) {
-                       s->timeout = diff;
-               }
-       }
-}
-
-static void audiod_post_select(__a_unused struct sched *s,
-       __a_unused struct task *t)
-{
-       int i;
-
-       t->ret = 1;
-       FOR_EACH_SLOT(i)
-               try_to_close_slot(i);
-}
-
-static void init_audiod_task(struct task *t)
-{
-       t->pre_select = audiod_pre_select;
-       t->post_select = audiod_post_select;
-       t->event_handler = NULL;
-       t->private_data = t;
-       sprintf(t->status, "audiod task");
-}
-
 static int parse_stream_command(const char *txt, char **cmd)
 {
        char *p = strchr(txt, ':');
 static int parse_stream_command(const char *txt, char **cmd)
 {
        char *p = strchr(txt, ':');
@@ -665,10 +613,10 @@ static int add_filter(int format, char *cmdline)
        filter_num = check_filter_arg(cmdline, &a->filter_conf[nf]);
        if (filter_num < 0)
                return filter_num;
        filter_num = check_filter_arg(cmdline, &a->filter_conf[nf]);
        if (filter_num < 0)
                return filter_num;
-       a->filters[nf] = &filters[filter_num];
+       a->filter_nums[nf] = filter_num;
        a->num_filters++;
        a->num_filters++;
-       PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf + 1,
-               a->filters[nf]->name);
+       PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
+               filters[filter_num].name);
        return filter_num;
 }
 
        return filter_num;
 }
 
@@ -679,7 +627,7 @@ static int init_writers(void)
        struct audio_format_info *a;
 
        init_supported_writers();
        struct audio_format_info *a;
 
        init_supported_writers();
-       nw = PARA_MAX(1, conf.writer_given);
+       nw = PARA_MAX(1U, conf.writer_given);
        PARA_INFO_LOG("maximal number of writers: %d\n", nw);
        FOR_EACH_AUDIO_FORMAT(i) {
                a = &afi[i];
        PARA_INFO_LOG("maximal number of writers: %d\n", nw);
        FOR_EACH_AUDIO_FORMAT(i) {
                a = &afi[i];
@@ -796,11 +744,11 @@ static int init_filters(void)
        int i, ret, nf;
 
        filter_init(filters);
        int i, ret, nf;
 
        filter_init(filters);
-       nf = PARA_MAX(1 conf.filter_given);
+       nf = PARA_MAX(1U, conf.filter_given);
        PARA_INFO_LOG("maximal number of filters: %d\n", nf);
        FOR_EACH_AUDIO_FORMAT(i) {
                afi[i].filter_conf = para_malloc(nf * sizeof(void *));
        PARA_INFO_LOG("maximal number of filters: %d\n", nf);
        FOR_EACH_AUDIO_FORMAT(i) {
                afi[i].filter_conf = para_malloc(nf * sizeof(void *));
-               afi[i].filters = para_malloc(nf * sizeof(struct filter *));
+               afi[i].filter_nums = para_malloc(nf * sizeof(unsigned));
        }
        if (!conf.no_default_filters_given)
                return init_default_filters();
        }
        if (!conf.no_default_filters_given)
                return init_default_filters();
@@ -840,10 +788,11 @@ static int init_stream_io(void)
        return 1;
 }
 
        return 1;
 }
 
+/* does not unlink socket on errors */
 static int audiod_get_socket(void)
 {
        struct sockaddr_un unix_addr;
 static int audiod_get_socket(void)
 {
        struct sockaddr_un unix_addr;
-       int fd;
+       int ret, fd;
 
        if (conf.socket_given)
                socket_name = para_strdup(conf.socket_arg);
 
        if (conf.socket_given)
                socket_name = para_strdup(conf.socket_arg);
@@ -856,86 +805,78 @@ static int audiod_get_socket(void)
        PARA_NOTICE_LOG("local socket: %s\n", socket_name);
        if (conf.force_given)
                unlink(socket_name);
        PARA_NOTICE_LOG("local socket: %s\n", socket_name);
        if (conf.force_given)
                unlink(socket_name);
-       fd = create_local_socket(socket_name, &unix_addr,
-                       S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
-       if (fd < 0) {
-               PARA_EMERG_LOG("can not connect to socket\n");
-               exit(EXIT_FAILURE); /* do not unlink socket */
-       }
+       ret = create_local_socket(socket_name, &unix_addr,
+               S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+       if (ret < 0)
+               goto err;
+       fd = ret;
        if (listen(fd , 5) < 0) {
        if (listen(fd , 5) < 0) {
-               PARA_EMERG_LOG("can not listen on socket\n");
-               exit(EXIT_FAILURE); /* do not unlink socket */
+               ret = -ERRNO_TO_PARA_ERROR(errno);
+               goto err;
        }
        }
-       mark_fd_nonblock(fd);
+       ret = mark_fd_nonblocking(fd);
+       if (ret < 0)
+               goto err;
        return fd;
        return fd;
-}
-
-static void signal_event_handler(struct task *t)
-{
-       struct signal_task *st = t->private_data;
-
-       switch (st->signum) {
-       case SIGINT:
-       case SIGTERM:
-       case SIGHUP:
-               PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
-               clean_exit(EXIT_FAILURE, "caught deadly signal");
-       }
+err:
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       exit(EXIT_FAILURE);
 }
 
 static void signal_pre_select(struct sched *s, struct task *t)
 {
 }
 
 static void signal_pre_select(struct sched *s, struct task *t)
 {
-       struct signal_task *st = t->private_data;
-       t->ret = 1;
+       struct signal_task *st = container_of(t, struct signal_task, task);
        para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
 static void signal_post_select(struct sched *s, struct task *t)
 {
        para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
 static void signal_post_select(struct sched *s, struct task *t)
 {
-       struct signal_task *st = t->private_data;
-       t->ret = 1;
+       struct signal_task *st = container_of(t, struct signal_task, task);
+
        if (!FD_ISSET(st->fd, &s->rfds))
                return;
        if (!FD_ISSET(st->fd, &s->rfds))
                return;
-       t->ret = -E_SIGNAL_CAUGHT;
+
        st->signum = para_next_signal();
        st->signum = para_next_signal();
+       switch (st->signum) {
+       case SIGINT:
+       case SIGTERM:
+       case SIGHUP:
+               PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+               clean_exit(EXIT_FAILURE, "caught deadly signal");
+       }
 }
 
 static void signal_setup_default(struct signal_task *st)
 {
        st->task.pre_select = signal_pre_select;
        st->task.post_select = signal_post_select;
 }
 
 static void signal_setup_default(struct signal_task *st)
 {
        st->task.pre_select = signal_pre_select;
        st->task.post_select = signal_post_select;
-       st->task.private_data = st;
        sprintf(st->task.status, "signal task");
 }
 
 static void command_pre_select(struct sched *s, struct task *t)
 {
        sprintf(st->task.status, "signal task");
 }
 
 static void command_pre_select(struct sched *s, struct task *t)
 {
-       struct command_task *ct = t->private_data;
-       t->ret = 1;
+       struct command_task *ct = container_of(t, struct command_task, task);
        para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
        para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
-
 }
 
 static void command_post_select(struct sched *s, struct task *t)
 {
        int ret;
 }
 
 static void command_post_select(struct sched *s, struct task *t)
 {
        int ret;
-       struct command_task *ct = t->private_data;
+       struct command_task *ct = container_of(t, struct command_task, task);
 
 
-       t->ret = 1; /* always successful */
        audiod_status_dump();
        if (!FD_ISSET(ct->fd, &s->rfds))
                return;
        ret = handle_connect(ct->fd);
        if (ret < 0)
        audiod_status_dump();
        if (!FD_ISSET(ct->fd, &s->rfds))
                return;
        ret = handle_connect(ct->fd);
        if (ret < 0)
-               PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 }
 
 static void init_command_task(struct command_task *ct)
 {
        ct->task.pre_select = command_pre_select;
        ct->task.post_select = command_post_select;
 }
 
 static void init_command_task(struct command_task *ct)
 {
        ct->task.pre_select = command_pre_select;
        ct->task.post_select = command_post_select;
-       ct->task.event_handler = NULL;
-       ct->task.private_data = ct;
+       ct->task.error = 0;
        ct->fd = audiod_get_socket(); /* doesn't return on errors */
        sprintf(ct->task.status, "command task");
 }
        ct->fd = audiod_get_socket(); /* doesn't return on errors */
        sprintf(ct->task.status, "command task");
 }
@@ -944,28 +885,19 @@ static void close_stat_pipe(void)
 {
        int i;
 
 {
        int i;
 
-       if (!stat_task->pcd)
+       if (!stat_task->ct)
                return;
                return;
-       client_close(stat_task->pcd);
-       stat_task->pcd = NULL;
-       for (i = 0; i < NUM_STAT_ITEMS; i++) {
-               free(stat_task->stat_item_values[i]);
-               stat_task->stat_item_values[i] = NULL;
+       client_close(stat_task->ct);
+       stat_task->ct = NULL;
+       FOR_EACH_STATUS_ITEM(i) {
+               free(stat_item_values[i]);
+               stat_item_values[i] = NULL;
        }
        dump_empty_status();
        stat_task->length_seconds = 0;
        stat_task->offset_seconds = 0;
        audiod_status_dump();
        stat_task->playing = 0;
        }
        dump_empty_status();
        stat_task->length_seconds = 0;
        stat_task->offset_seconds = 0;
        audiod_status_dump();
        stat_task->playing = 0;
-       stat_task->stat_item_values[SI_BASENAME] = make_message(
-               "%s:no connection to para_server\n",
-               status_item_list[SI_BASENAME]);
-       stat_client_write(stat_task->stat_item_values[SI_BASENAME],
-               SI_BASENAME);
-       if (stat_task->clock_diff_count) {
-               stat_task->clock_diff_barrier.tv_sec = now->tv_sec + 1;
-               stat_task->clock_diff_barrier.tv_usec = now->tv_usec;
-       }
 }
 
 /**
 }
 
 /**
@@ -990,94 +922,156 @@ void __noreturn clean_exit(int status, const char *msg)
 }
 
 /* avoid busy loop if server is down */
 }
 
 /* avoid busy loop if server is down */
-static void set_stat_task_restart_barrier(void)
+static void set_stat_task_restart_barrier(unsigned seconds)
 {
 {
-       struct timeval delay = {5, 0};
+       struct timeval delay = {seconds, 0};
        tv_add(now, &delay, &stat_task->restart_barrier);
 }
 
        tv_add(now, &delay, &stat_task->restart_barrier);
 }
 
-static void client_task_event_handler(__a_unused struct task *t)
+static void try_to_close_slot(int slot_num)
 {
 {
-       int i;
+       struct slot_info *s = &slot[slot_num];
 
 
-       if (t->ret == -E_HANDSHAKE_COMPLETE)
+       if (s->format < 0)
                return;
                return;
-       unregister_task(t);
-       close_stat_pipe();
-       if (t->ret != -E_SERVER_EOF)
-               stat_task->clock_diff_count = conf.clock_diff_count_arg;
-       set_stat_task_restart_barrier();
-       FOR_EACH_AUDIO_FORMAT(i)
-               afi[i].restart_barrier = stat_task->restart_barrier;
+       if (s->receiver_node && s->receiver_node->task.error != -E_TASK_UNREGISTERED)
+               return;
+       if (s->fc && s->fc->task.error != -E_TASK_UNREGISTERED)
+               return;
+       if (s->wng && s->wng->task.error != -E_TASK_UNREGISTERED)
+               return;
+       PARA_INFO_LOG("closing slot %d\n", slot_num);
+       wng_close(s->wng);
+       close_filters(s->fc);
+       free(s->fc);
+       close_receiver(slot_num);
+       clear_slot(slot_num);
 }
 
 }
 
-static void status_pre_select(struct sched *s, struct task *t)
+/*
+ * Check if any receivers/filters/writers need to be started and do so if
+ * necessary.
+ */
+static void start_stop_decoders(struct sched *s)
 {
 {
-       struct status_task *st = t->private_data;
-       int ret;
+       int i;
 
 
-       t->ret = 1; /* always successful */
-       if (st->pcd || audiod_status == AUDIOD_OFF)
-               return;
-       if (!st->clock_diff_count && tv_diff(now, &st->restart_barrier, NULL)
-                       < 0)
-               return;
-       if (st->clock_diff_count) {
-               char *argv[] = {"audiod", "stat", "1", NULL};
-               int argc = 3;
-               if (tv_diff(now, &st->clock_diff_barrier, NULL) < 0)
-                       return;
-               PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
-               ret = client_open(argc, argv, &st->pcd);
+       FOR_EACH_SLOT(i)
+               try_to_close_slot(i);
+       if (audiod_status != AUDIOD_ON || !stat_task->playing)
+               return kill_all_decoders(-E_NOT_PLAYING);
+       open_current_receiver(s);
+       FOR_EACH_SLOT(i) {
+               struct slot_info *sl = &slot[i];
+               struct audio_format_info *a;
+               struct timeval diff;
 
 
-       } else {
-               char *argv[] = {"audiod", "stat", NULL};
-               int argc = 2;
-               ret = client_open(argc, argv, &st->pcd);
+               if (sl->format < 0)
+                       continue;
+               a = &afi[sl->format];
+               if (!sl->receiver_node)
+                       continue;
+               if ((!a->num_filters || sl->fc) && sl->wng)
+                       continue; /* everything already started */
+               if (!a->num_filters) {
+                       if (sl->receiver_node->loaded && !sl->wng) {
+                               open_writers(i);
+                       }
+                       continue;
+               }
+               if (sl->receiver_node->loaded && !sl->fc) {
+                       open_filters(i);
+                       continue;
+               }
+               if (sl->wng || !sl->fc || !*sl->fc->out_loaded)
+                       continue;
+               if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
+                       open_writers(i);
+                       continue;
+               }
+               PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));
+               if (tv_diff(&s->timeout, &diff, NULL) > 0) {
+                       s->timeout = diff;
+               }
        }
        }
-       set_stat_task_restart_barrier();
-       if (ret < 0)
-               return;
-       st->pcd->task.event_handler = client_task_event_handler;
-       s->timeout.tv_sec = 0;
-       s->timeout.tv_usec = 1;
 }
 
 }
 
-static void status_post_select(__a_unused struct sched *s, struct task *t)
+
+/* restart the client task if necessary */
+static void status_pre_select(struct sched *s, struct task *t)
 {
 {
-       struct status_task *st = t->private_data;
-       unsigned bytes_left;
+       struct status_task *st = container_of(t, struct status_task, task);
 
 
-       t->ret = 1;
-       if (!st->pcd || st->pcd->status != CL_RECEIVING)
-               return;
-       if (st->pcd && audiod_status == AUDIOD_OFF) {
-               unregister_task(&st->pcd->task);
+       if (audiod_status == AUDIOD_OFF) {
+               if (!st->ct)
+                       goto out;
+               if (st->ct->task.error >= 0) {
+                       st->ct->task.error = -E_AUDIOD_OFF;
+                       goto out;
+               }
+               if (st->ct->task.error != -E_TASK_UNREGISTERED)
+                       goto out;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
                close_stat_pipe();
                st->clock_diff_count = conf.clock_diff_count_arg;
-               return;
+               goto out;
        }
        }
-       bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
-               &check_stat_line, NULL);
-       if (st->pcd->loaded != bytes_left) {
-               st->last_status_read = *now;
-               st->pcd->loaded = bytes_left;
-       } else {
-               struct timeval diff;
-               tv_diff(now, &st->last_status_read, &diff);
-               if (diff.tv_sec > 61)
+       if (st->ct) {
+               unsigned bytes_left;
+               if (st->ct->task.error < 0) {
+                       if (st->ct->task.error != -E_TASK_UNREGISTERED)
+                               goto out;
                        close_stat_pipe();
                        close_stat_pipe();
+                       goto out;
+               }
+               if (st->ct->status != CL_RECEIVING)
+                       goto out;
+               bytes_left = for_each_line(st->ct->buf, st->ct->loaded,
+                       &check_stat_line, NULL);
+               if (st->ct->loaded != bytes_left) {
+                       st->last_status_read = *now;
+                       st->ct->loaded = bytes_left;
+               } else {
+                       struct timeval diff;
+                       tv_diff(now, &st->last_status_read, &diff);
+                       if (diff.tv_sec > 61)
+                               st->ct->task.error = -E_STATUS_TIMEOUT;
+               }
+               goto out;
+       }
+       if (tv_diff(now, &st->restart_barrier, NULL) < 0)
+               goto out;
+       if (st->clock_diff_count) { /* get status only one time */
+               char *argv[] = {"audiod", "stat", "1", NULL};
+               int argc = 3;
+               PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
+               st->clock_diff_count--;
+               client_open(argc, argv, &st->ct);
+               set_stat_task_restart_barrier(2);
+
+       } else {
+               char *argv[] = {"audiod", "stat", NULL};
+               int argc = 2;
+               client_open(argc, argv, &st->ct);
+               set_stat_task_restart_barrier(5);
        }
        }
+       free(stat_item_values[SI_BASENAME]);
+       stat_item_values[SI_BASENAME] = make_message(
+               "%s: no connection to para_server\n",
+               status_item_list[SI_BASENAME]);
+       stat_client_write(stat_item_values[SI_BASENAME],
+               SI_BASENAME);
+       st->last_status_read = *now;
+out:
+       start_stop_decoders(s);
 }
 
 static void init_status_task(struct status_task *st)
 {
        memset(st, 0, sizeof(struct status_task));
        st->task.pre_select = status_pre_select;
 }
 
 static void init_status_task(struct status_task *st)
 {
        memset(st, 0, sizeof(struct status_task));
        st->task.pre_select = status_pre_select;
-       st->task.post_select = status_post_select;
-       st->task.private_data = st;
        st->sa_time_diff_sign = 1;
        st->clock_diff_count = conf.clock_diff_count_arg;
        st->sa_time_diff_sign = 1;
        st->clock_diff_count = conf.clock_diff_count_arg;
+       st->current_audio_format_num = -1;
        sprintf(st->task.status, "status task");
 }
 
        sprintf(st->task.status, "status task");
 }
 
@@ -1095,9 +1089,27 @@ static void set_initial_status(void)
                return;
        }
        if (strcmp(conf.mode_arg, "on"))
                return;
        }
        if (strcmp(conf.mode_arg, "on"))
-               PARA_WARNING_LOG("%s", "invalid mode\n");
+               PARA_WARNING_LOG("invalid mode\n");
 }
 
 }
 
+__noreturn static void print_help_and_die(void)
+{
+       int d = conf.detailed_help_given;
+       const char **p = d? audiod_args_info_detailed_help
+               : audiod_args_info_help;
+
+       printf_or_die("%s\n\n", AUDIOD_CMDLINE_PARSER_PACKAGE "-"
+               AUDIOD_CMDLINE_PARSER_VERSION);
+       printf_or_die("%s\n\n", audiod_args_info_usage);
+       for (; *p; p++)
+               printf_or_die("%s\n", *p);
+       print_receiver_helps(d);
+       print_filter_helps(d);
+       print_writer_helps(d);
+       exit(0);
+}
+
+
 /**
  * the main function of para_audiod
  *
 /**
  * the main function of para_audiod
  *
@@ -1110,39 +1122,32 @@ static void set_initial_status(void)
  * */
 int main(int argc, char *argv[])
 {
  * */
 int main(int argc, char *argv[])
 {
-       char *config_file;
        int ret, i;
        int ret, i;
-       struct sched s;
+       static struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
-       struct task audiod_task_struct, *audiod_task = &audiod_task_struct;
+       struct audiod_cmdline_parser_params params = {
+               .override = 0,
+               .initialize = 1,
+               .check_required = 0,
+               .check_ambiguity = 0,
+               .print_errors = 1
+       };
 
        valid_fd_012();
 
        valid_fd_012();
-       audiod_cmdline_parser(argc, argv, &conf);
+       audiod_cmdline_parser_ext(argc, argv, &conf, &params);
        HANDLE_VERSION_FLAG("audiod", conf);
        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
-
-               };
-               if (audiod_cmdline_parser_config_file(config_file, &conf, &params)) {
-                       PARA_EMERG_LOG("%s", "parse error in config file\n");
-                       exit(EXIT_FAILURE);
-               }
-               free(config_file);
-       }
+       drop_privileges_or_die(conf.user_arg, conf.group_arg);
+       parse_config_or_die();
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
-       log_welcome("para_audiod", conf.loglevel_arg);
        i = init_stream_io();
        i = init_stream_io();
+       if (conf.help_given || conf.detailed_help_given)
+               print_help_and_die();
        if (i < 0) {
        if (i < 0) {
-               PARA_EMERG_LOG("init stream io error: %s\n", PARA_STRERROR(-i));
+               PARA_EMERG_LOG("init stream io error: %s\n", para_strerror(-i));
                exit(EXIT_FAILURE);
        }
                exit(EXIT_FAILURE);
        }
+       log_welcome("para_audiod", conf.loglevel_arg);
        server_uptime(UPTIME_SET);
        set_initial_status();
        FOR_EACH_SLOT(i)
        server_uptime(UPTIME_SET);
        set_initial_status();
        FOR_EACH_SLOT(i)
@@ -1150,11 +1155,9 @@ int main(int argc, char *argv[])
        init_grabbing();
        setup_signal_handling();
        signal_setup_default(sig_task);
        init_grabbing();
        setup_signal_handling();
        signal_setup_default(sig_task);
-       sig_task->task.event_handler = signal_event_handler;
 
        init_status_task(stat_task);
        init_command_task(cmd_task);
 
        init_status_task(stat_task);
        init_command_task(cmd_task);
-       init_audiod_task(audiod_task);
 
        if (conf.daemon_given)
                daemon_init();
 
        if (conf.daemon_given)
                daemon_init();
@@ -1162,11 +1165,10 @@ int main(int argc, char *argv[])
        register_task(&sig_task->task);
        register_task(&cmd_task->task);
        register_task(&stat_task->task);
        register_task(&sig_task->task);
        register_task(&cmd_task->task);
        register_task(&stat_task->task);
-       register_task(audiod_task);
        s.default_timeout.tv_sec = 0;
        s.default_timeout.tv_usec = 99 * 1000;
        s.default_timeout.tv_sec = 0;
        s.default_timeout.tv_usec = 99 * 1000;
-       ret = sched(&s);
+       ret = schedule(&s);
 
 
-       PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));
        return EXIT_FAILURE;
 }
        return EXIT_FAILURE;
 }