Fix documentation of select command.

[paraslash.git] / audiod.c

diff --git a/audiod.c b/audiod.c
index 8eb425da95af4701879e0e077efc496a20bbdeb7..6fd8eef15a5b3c5f0c07c16795155daa63691ddc 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -1,25 +1,15 @@
 /*
 /*

- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>

  *
  *

- *     This program 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.
- *
- *     This program 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 this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file audiod.c the paraslash's audio daemon */
  */
 
 /** \file audiod.c the paraslash's audio daemon */

+#include <sys/types.h>
+#include <dirent.h>

 
 #include "para.h"
 
 #include "para.h"

-
+#include "error.h"

 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"
 #include "audiod.cmdline.h"
 #include "list.h"
 #include "sched.h"


@@ -36,7 +26,6 @@
 #include "fd.h"
 #include "write.h"
 #include "write_common.h"
 #include "fd.h"
 #include "write.h"
 #include "write_common.h"

-#include "error.h"

 #include "signal.h"
 
 /** define the array of error lists needed by para_audiod */
 #include "signal.h"
 
 /** define the array of error lists needed by para_audiod */


@@ -44,7 +33,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;


@@ -66,12 +55,28 @@ struct audio_format_info {
        struct timeval restart_barrier;
 };
 
        struct timeval restart_barrier;
 };
 

+/**
+ * para_audiod uses \p MAX_STREAM_SLOTS different slots, each of which may
+ * be associated with a receiver/filter/writer triple. This array holds all
+ * information on the status of these slots.
+ *
+ * \sa struct slot_info
+ * */

 struct slot_info slot[MAX_STREAM_SLOTS];
 
 
 struct slot_info slot[MAX_STREAM_SLOTS];
 
 

+/**
+ * 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.
+ */

 int audiod_status = AUDIOD_ON;
 
 int audiod_status = AUDIOD_ON;
 

+/**
+ * the gengetopt args_info struct that holds information on all command line
+ * arguments
+ */

 struct audiod_args_info conf;
 struct audiod_args_info conf;

+

 static char *socket_name;
 static FILE *logfile;
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];
 static char *socket_name;
 static FILE *logfile;
 static struct audio_format_info afi[NUM_AUDIO_FORMATS];


@@ -79,6 +84,12 @@ static struct audio_format_info afi[NUM_AUDIO_FORMATS];
 static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
 
 static struct status_task status_task_struct;
 static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
 
 static struct status_task status_task_struct;

+
+/**
+ * the task that calls the status command of para_server
+ *
+ * \sa struct status_task
+ */

 struct status_task *stat_task = &status_task_struct;
 static struct timeval initial_delay_barrier;
 
 struct status_task *stat_task = &status_task_struct;
 static struct timeval initial_delay_barrier;
 


@@ -94,18 +105,6 @@ struct command_task {
        struct task task;
 };
 
        struct task task;
 };
 

-/**
- * task for signal handling
- */
-struct signal_task {
-       /** the signal pipe */
-       int fd;
-       /** the number of the most recent signal */
-       int signum;
-       /** the associated task structure */
-       struct task task;
-};
-

 /** iterate over all supported audio formats */
 #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
 
 /** iterate over all supported audio formats */
 #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++)
 


@@ -119,14 +118,20 @@ struct signal_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;
 }
 

-/*
- * log function. first argument is loglevel.
+/**
+ * the log function of para_audiod
+ *
+ * \param ll loglevel
+ * \param fmt the format string

  */
 void para_log(int ll, const char* fmt,...)
 {
  */
 void para_log(int ll, const char* fmt,...)
 {


@@ -139,6 +144,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,14 +162,14 @@ void para_log(int ll, const char* fmt,...)
 
 static char *configfile_exists(void)
 {
 
 static char *configfile_exists(void)
 {

-       static char *config_file;
-
-       if (!config_file) {
-               char *home = para_homedir();
-               config_file = make_message("%s/.paraslash/audiod.conf", home);
-               free(home);
-       }
-       return file_exists(config_file)? config_file : NULL;
+       char *home = para_homedir();
+       char *config_file = make_message("%s/.paraslash/audiod.conf",
+               home);
+       free(home);
+       if (file_exists(config_file))
+               return config_file;
+       free(config_file);
+       return NULL;

 }
 
 static void setup_signal_handling(void)
 }
 
 static void setup_signal_handling(void)


@@ -192,34 +199,34 @@ 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) {
+               if (s->wng && !s->wng->error) {

                        PARA_INFO_LOG("unregistering writer node group in slot %d\n",
                                i);
                        wng_unregister(s->wng);
                        PARA_INFO_LOG("unregistering writer node group in slot %d\n",
                                i);
                        wng_unregister(s->wng);

-                       s->wng->eof = 1;
+                       s->wng->error = error;

                }
                }

-               if (s->fc && !s->fc->eof) {
+               if (s->fc && !s->fc->error) {

                        PARA_INFO_LOG("unregistering filter chain in slot %d\n", i);
                        unregister_task(&s->fc->task);
                        PARA_INFO_LOG("unregistering filter chain in slot %d\n", i);
                        unregister_task(&s->fc->task);

-                       s->fc->eof = 1;
+                       s->fc->error = error;

                }
                }

-               if (s->receiver_node && !s->receiver_node->eof) {
+               if (s->receiver_node && !s->receiver_node->error) {

                        PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i);
                        unregister_task(&s->receiver_node->task);
                        PARA_INFO_LOG("unregistering receiver_node in slot %d\n", i);
                        unregister_task(&s->receiver_node->task);

-                       s->receiver_node->eof = 1;
+                       s->receiver_node->error = error;

                }
        }
 }
                }
        }
 }


@@ -243,43 +250,6 @@ static int get_empty_slot(void)
        return -E_NO_MORE_SLOTS;
 }
 
        return -E_NO_MORE_SLOTS;
 }
 

-static void close_stat_pipe(void)
-{
-       int i;
-
-       if (!stat_task->pcd)
-               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;
-       }
-       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_STATUS_BAR] = make_message(
-               "%s:no connection to para_server\n",
-               status_item_list[SI_STATUS_BAR]);
-       stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR],
-               SI_STATUS_BAR);
-       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;
-       }
-}
-
-void __noreturn clean_exit(int status, const char *msg)
-{
-       PARA_EMERG_LOG("%s\n", msg);
-       if (socket_name)
-               unlink(socket_name);
-       close_stat_pipe();
-       exit(status);
-}
-

 /**
  * get the number of filters
  *
 /**
  * get the number of filters
  *


@@ -296,9 +266,9 @@ int num_filters(int audio_format_num)
 
 static void filter_event_handler(struct task *t)
 {
 
 static void filter_event_handler(struct task *t)
 {

-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));

        struct filter_chain *fc = t->private_data;
        struct filter_chain *fc = t->private_data;

-       fc->eof = 1;
+       fc->error = t->ret;

        unregister_task(t);
 }
 
        unregister_task(t);
 }
 


@@ -317,13 +287,13 @@ static void open_filters(int slot_num)
        INIT_LIST_HEAD(&s->fc->filters);
        s->fc->inbuf = s->receiver_node->buf;
        s->fc->in_loaded = &s->receiver_node->loaded;
        INIT_LIST_HEAD(&s->fc->filters);
        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->error;

        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->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->error = 0;

 
 

-       s->receiver_node->output_eof = &s->fc->eof;
+       s->receiver_node->output_error = &s->fc->error;

        sprintf(s->fc->task.status, "filter chain");
        for (i = 0; i < nf; i++) {
                struct filter_node *fn = para_calloc(sizeof(struct filter_node));
        sprintf(s->fc->task.status, "filter chain");
        for (i = 0; i < nf; i++) {
                struct filter_node *fn = para_calloc(sizeof(struct filter_node));


@@ -346,8 +316,8 @@ static void wng_event_handler(struct task *t)
 {
        struct writer_node_group *wng = t->private_data;
 
 {
        struct writer_node_group *wng = t->private_data;
 

-       PARA_INFO_LOG("%s\n", PARA_STRERROR(-t->ret));
-       wng->eof = 1;
+       PARA_INFO_LOG("%s\n", para_strerror(-t->ret));
+       wng->error = t->ret;

        wng_unregister(wng);
 }
 
        wng_unregister(wng);
 }
 


@@ -365,15 +335,15 @@ 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->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->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->error;

        }
        s->wng->task.event_handler = wng_event_handler;
        for (i = 0; i < a->num_writers; i++) {
        }
        s->wng->task.event_handler = wng_event_handler;
        for (i = 0; i < a->num_writers; i++) {


@@ -382,7 +352,7 @@ static void open_writers(int slot_num)
        }
        ret = wng_open(s->wng);
        if (ret < 0) {
        }
        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;


@@ -392,16 +362,19 @@ static void open_writers(int slot_num)
 static void rn_event_handler(struct task *t)
 {
        struct receiver_node *rn = t->private_data;
 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;
 
        int i;
 

-       PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+       PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));

        unregister_task(t);
        unregister_task(t);

-       rn->eof = 1;
+       rn->error = t->ret;

        /* set restart barrier */
        FOR_EACH_SLOT(i) {
        /* set restart barrier */
        FOR_EACH_SLOT(i) {

+               struct timeval restart_delay = {0, 10 * 1000};

                if (slot[i].receiver_node != rn)
                        continue;
                if (slot[i].receiver_node != rn)
                        continue;

+               if (rn->error != -E_RECV_EOF)
+                       /* don't reconnect immediately on errors */
+                       restart_delay.tv_sec = 5;

                tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier);
        }
 }
                tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier);
        }
 }


@@ -440,7 +413,7 @@ static int open_receiver(int format)
        register_task(&rn->task);
        return 1;
 err:
        register_task(&rn->task);
        return 1;
 err:

-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       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;
 }


@@ -452,7 +425,7 @@ static int receiver_running(int format)
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
                if (s->format == format && s->receiver_node
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
                if (s->format == format && s->receiver_node

-                               && !s->receiver_node->eof)
+                               && !s->receiver_node->error)

                        return 1;
        }
        return 0;
                        return 1;
        }
        return 0;


@@ -460,33 +433,30 @@ 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)
-               return 0;
-       i = get_audio_format_num(audio_format + strlen(
-               status_item_list[SI_FORMAT]) + 1);
-       if (i < 0)
+       if (cafn < 0 || !stat_task->pcd)

                return 0;
                return 0;

-       if (receiver_running(i))
+       if (receiver_running(cafn))

                return 0;
                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 void compute_time_diff(const struct timeval *status_time)
+static unsigned compute_time_diff(const struct timeval *status_time)

 {
        struct timeval tmp, diff;
 {
        struct timeval tmp, diff;

-       static int count;
+       static unsigned count;

        int sign, sa_time_diff_sign = stat_task->sa_time_diff_sign;
        const struct timeval max_deviation = {0, 500 * 1000};
        const int time_smooth = 5;
 
        int sign, sa_time_diff_sign = stat_task->sa_time_diff_sign;
        const struct timeval max_deviation = {0, 500 * 1000};
        const int time_smooth = 5;
 

+       if (!status_time)
+               return count;

        sign = tv_diff(status_time, now, &diff);
 //             PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__,
 //                     sign, sa_time_diff_sign);
        sign = tv_diff(status_time, now, &diff);
 //             PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__,
 //                     sign, sa_time_diff_sign);


@@ -516,9 +486,10 @@ static void compute_time_diff(const struct timeval *status_time)
        );
 out:
        stat_task->sa_time_diff_sign = sa_time_diff_sign;
        );
 out:
        stat_task->sa_time_diff_sign = sa_time_diff_sign;

+       return count;

 }
 
 }
 

-static void check_stat_line(char *line)
+static int check_stat_line(char *line, __a_unused void *data)

 {
        int itemnum;
        size_t ilen = 0;
 {
        int itemnum;
        size_t ilen = 0;


@@ -527,14 +498,14 @@ static void check_stat_line(char *line)
 
 //     PARA_INFO_LOG("line: %s\n", line);
        if (!line)
 
 //     PARA_INFO_LOG("line: %s\n", line);
        if (!line)

-               return;
+               return 1;

        itemnum = stat_line_valid(line);
        if (itemnum < 0) {
                PARA_WARNING_LOG("invalid status line: %s\n", line);
        itemnum = stat_line_valid(line);
        if (itemnum < 0) {
                PARA_WARNING_LOG("invalid status line: %s\n", line);

-               return;
+               return 1;

        }
        if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)
        }
        if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME)

-               return;
+               return 1;

        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);


@@ -548,7 +519,7 @@ static void check_stat_line(char *line)
        case SI_OFFSET:
                stat_task->offset_seconds = atoi(line + ilen + 1);
                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:


@@ -558,13 +529,15 @@ static void check_stat_line(char *line)
                        delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
                        stat_task->server_stream_start.tv_sec = sec;
                        stat_task->server_stream_start.tv_usec = usec;
                        delay.tv_usec = (conf.stream_delay_arg % 1000) * 1000;
                        stat_task->server_stream_start.tv_sec = sec;
                        stat_task->server_stream_start.tv_usec = usec;

-                       if (stat_task->sa_time_diff_sign < 0)
-                               tv_add(&stat_task->server_stream_start,
-                                       &stat_task->sa_time_diff, &a_start);
-                       else
-                               tv_diff(&stat_task->server_stream_start,
-                                       &stat_task->sa_time_diff, &a_start);
-                       tv_add(&a_start, &delay, &initial_delay_barrier);
+                       if (compute_time_diff(NULL) > 2) {
+                               if (stat_task->sa_time_diff_sign < 0)
+                                       tv_add(&stat_task->server_stream_start,
+                                               &stat_task->sa_time_diff, &a_start);
+                               else
+                                       tv_diff(&stat_task->server_stream_start,
+                                               &stat_task->sa_time_diff, &a_start);
+                               tv_add(&a_start, &delay, &initial_delay_barrier);
+                       }

                }
                break;
        case SI_CURRENT_TIME:
                }
                break;
        case SI_CURRENT_TIME:


@@ -575,19 +548,11 @@ static void check_stat_line(char *line)
                if (stat_task->clock_diff_count)
                        stat_task->clock_diff_count--;
                break;
                if (stat_task->clock_diff_count)
                        stat_task->clock_diff_count--;
                break;

+       case SI_FORMAT:
+               stat_task->current_audio_format_num = get_audio_format_num(
+                       line + ilen + 1);

        }
        }

-}
-
-static void handle_signal(int sig)
-{
-       switch (sig) {
-       case SIGINT:
-       case SIGTERM:
-       case SIGHUP:
-               PARA_EMERG_LOG("terminating on signal %d\n", sig);
-               clean_exit(EXIT_FAILURE, "caught deadly signal");
-               return;
-       }
+       return 1;

 }
 
 static void try_to_close_slot(int slot_num)
 }
 
 static void try_to_close_slot(int slot_num)


@@ -596,13 +561,13 @@ static void try_to_close_slot(int slot_num)
 
        if (s->format < 0)
                return;
 
        if (s->format < 0)
                return;

-       if (s->receiver_node && !s->receiver_node->eof)
+       if (s->receiver_node && !s->receiver_node->error)

                return;
                return;

-       if (s->fc && !s->fc->eof)
+       if (s->fc && !s->fc->error)

                return;
                return;

-       if (s->wng && !s->wng->eof)
+       if (s->wng && !s->wng->error)

                return;
                return;

-       PARA_INFO_LOG("closing slot %d \n", slot_num);
+       PARA_INFO_LOG("closing slot %d\n", slot_num);

        wng_close(s->wng);
        close_filters(s->fc);
        free(s->fc);
        wng_close(s->wng);
        close_filters(s->fc);
        free(s->fc);


@@ -612,7 +577,7 @@ static void try_to_close_slot(int slot_num)
 
 /*
  * Check if any receivers/filters/writers need to be started and do so if
 
 /*
  * Check if any receivers/filters/writers need to be started and do so if

- * neccessary.  Since the pre_select function didn't have a chance yet to put
+ * 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.
  */
  * 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.
  */


@@ -623,7 +588,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
 
        t->ret = 1;
        if (audiod_status != AUDIOD_ON || !stat_task->playing)
 
        t->ret = 1;
        if (audiod_status != AUDIOD_ON || !stat_task->playing)

-               return kill_all_decoders();
+               return kill_all_decoders(-E_NOT_PLAYING);

        if (open_current_receiver(s))
                s->timeout = min_delay;
        FOR_EACH_SLOT(i) {
        if (open_current_receiver(s))
                s->timeout = min_delay;
        FOR_EACH_SLOT(i) {


@@ -636,6 +601,8 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
                a = &afi[sl->format];
                if (!sl->receiver_node)
                        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);
                if (!a->num_filters) {
                        if (sl->receiver_node->loaded && !sl->wng) {
                                open_writers(i);


@@ -648,14 +615,14 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
                        s->timeout = min_delay;
                        continue;
                }
                        s->timeout = min_delay;
                        continue;
                }

-               if (!sl->fc || !*sl->fc->out_loaded || sl->wng)
+               if (sl->wng || !sl->fc || !*sl->fc->out_loaded)

                        continue;
                if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
                        open_writers(i);
                        s->timeout = min_delay;
                        continue;
                }
                        continue;
                if (tv_diff(now, &initial_delay_barrier, &diff) > 0) {
                        open_writers(i);
                        s->timeout = min_delay;
                        continue;
                }

-               PARA_INFO_LOG("inital delay: %lu ms left\n", tv2ms(&diff));
+               PARA_INFO_LOG("initial delay: %lu ms left\n", tv2ms(&diff));

                if (tv_diff(&s->timeout, &diff, NULL) > 0) {
                        s->timeout = diff;
                }
                if (tv_diff(&s->timeout, &diff, NULL) > 0) {
                        s->timeout = diff;
                }


@@ -881,10 +848,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);


@@ -897,28 +865,35 @@ 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_pf_socket(socket_name, &unix_addr,
-                       S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
-       if (fd < 0) {
-               PARA_EMERG_LOG("%s", "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("%s", "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;

+err:
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+       exit(EXIT_FAILURE);

 }
 
 static void signal_event_handler(struct task *t)
 {
        struct signal_task *st = t->private_data;
 
 }
 
 static void signal_event_handler(struct task *t)
 {
        struct signal_task *st = t->private_data;
 

-       if (t->ret != -E_SIGNAL_CAUGHT)
-               PARA_ERROR_LOG("%s (ignored)\n", PARA_STRERROR(-t->ret));
-       else
-               handle_signal(st->signum);
+       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_pre_select(struct sched *s, struct task *t)
 }
 
 static void signal_pre_select(struct sched *s, struct task *t)


@@ -965,7 +940,7 @@ static void command_post_select(struct sched *s, struct task *t)
                return;
        ret = handle_connect(ct->fd);
        if (ret < 0)
                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)
 }
 
 static void init_command_task(struct command_task *ct)


@@ -978,36 +953,83 @@ static void init_command_task(struct command_task *ct)
        sprintf(ct->task.status, "command task");
 }
 
        sprintf(ct->task.status, "command task");
 }
 

-static void client_task_event_handler(__a_unused struct task *t)
+static void close_stat_pipe(void)

 {
 {

-       struct private_client_data *pcd = t->private_data;
-       if (t->ret == -E_HANDSHAKE_COMPLETE)
+       int i;
+
+       if (!stat_task->pcd)

                return;
                return;

-       unregister_task(t);
-       pcd->eof = 1;
+       client_close(stat_task->pcd);
+       stat_task->pcd = NULL;
+       FOR_EACH_STATUS_ITEM(i) {
+               free(stat_task->stat_item_values[i]);
+               stat_task->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;
+       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;
+       }
+}
+
+/**
+ * close the connection to para_server and exit
+ *
+ * \param status the exit status which is passed to exit(3)
+ * \param msg the log message
+ *
+ * Log \a msg with loglevel \p EMERG, close the connection to para_server if
+ * open, and call \p exit(status). \a status should be either EXIT_SUCCESS or
+ * EXIT_FAILURE.
+ *
+ * \sa exit(3)
+ */
+void __noreturn clean_exit(int status, const char *msg)
+{
+       PARA_EMERG_LOG("%s\n", msg);
+       if (socket_name)
+               unlink(socket_name);
+       close_stat_pipe();
+       exit(status);
+}
+
+/* avoid busy loop if server is down */
+static void set_stat_task_restart_barrier(void)
+{
+       struct timeval delay = {5, 0};
+       tv_add(now, &delay, &stat_task->restart_barrier);

 }
 
 }
 

-static void status_event_handler(__a_unused struct task *t)
+static void client_task_event_handler(__a_unused struct task *t)

 {
 {

-       struct timeval delay = {1, 0};

        int i;
        int i;

-       struct status_task *st = t->private_data;

 
 

-       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-t->ret));
+       if (t->ret == -E_HANDSHAKE_COMPLETE)
+               return;
+       unregister_task(t);

        close_stat_pipe();
        close_stat_pipe();

-       /* avoid busy loop if server is down */
-       tv_add(now, &delay, &st->restart_barrier);
+       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)
        FOR_EACH_AUDIO_FORMAT(i)

-               afi[i].restart_barrier = st->restart_barrier;
+               afi[i].restart_barrier = stat_task->restart_barrier;

 }
 
 static void status_pre_select(struct sched *s, struct task *t)
 {
        struct status_task *st = t->private_data;
 }
 
 static void status_pre_select(struct sched *s, struct task *t)
 {
        struct status_task *st = t->private_data;

+       int ret;

 
 

-       t->ret = 1;
-       if (st->pcd && (audiod_status == AUDIOD_OFF || st->pcd->eof))
-               close_stat_pipe();
+       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)
        if (st->pcd || audiod_status == AUDIOD_OFF)
                return;
        if (!st->clock_diff_count && tv_diff(now, &st->restart_barrier, NULL)


@@ -1019,15 +1041,15 @@ static void status_pre_select(struct sched *s, struct task *t)
                if (tv_diff(now, &st->clock_diff_barrier, NULL) < 0)
                        return;
                PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);
                if (tv_diff(now, &st->clock_diff_barrier, NULL) < 0)
                        return;
                PARA_INFO_LOG("clock diff count: %d\n", st->clock_diff_count);

-               t->ret = client_open(argc, argv, &st->pcd);
+               ret = client_open(argc, argv, &st->pcd);

 
        } else {
                char *argv[] = {"audiod", "stat", NULL};
                int argc = 2;
 
        } else {
                char *argv[] = {"audiod", "stat", NULL};
                int argc = 2;

-               t->ret = client_open(argc, argv, &st->pcd);
+               ret = client_open(argc, argv, &st->pcd);

        }
        }

-
-       if (t->ret < 0)
+       set_stat_task_restart_barrier();
+       if (ret < 0)

                return;
        st->pcd->task.event_handler = client_task_event_handler;
        s->timeout.tv_sec = 0;
                return;
        st->pcd->task.event_handler = client_task_event_handler;
        s->timeout.tv_sec = 0;


@@ -1042,8 +1064,14 @@ static void status_post_select(__a_unused struct sched *s, struct task *t)
        t->ret = 1;
        if (!st->pcd || st->pcd->status != CL_RECEIVING)
                return;
        t->ret = 1;
        if (!st->pcd || st->pcd->status != CL_RECEIVING)
                return;

+       if (st->pcd && audiod_status == AUDIOD_OFF) {
+               unregister_task(&st->pcd->task);
+               close_stat_pipe();
+               st->clock_diff_count = conf.clock_diff_count_arg;
+               return;
+       }

        bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
        bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,

-               &check_stat_line);
+               &check_stat_line, NULL);

        if (st->pcd->loaded != bytes_left) {
                st->last_status_read = *now;
                st->pcd->loaded = bytes_left;
        if (st->pcd->loaded != bytes_left) {
                st->last_status_read = *now;
                st->pcd->loaded = bytes_left;


@@ -1060,10 +1088,10 @@ 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;
        memset(st, 0, sizeof(struct status_task));
        st->task.pre_select = status_pre_select;
        st->task.post_select = status_post_select;

-       st->task.event_handler = status_event_handler;

        st->task.private_data = st;
        st->sa_time_diff_sign = 1;
        st->clock_diff_count = conf.clock_diff_count_arg;
        st->task.private_data = st;
        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");
 }
 


@@ -1081,12 +1109,22 @@ 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");

 }
 
 }
 

+/**
+ * the main function of para_audiod
+ *
+ * \param argc usual argument count
+ * \param argv usual argument vector
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
+ * \sa para_audiod(1)
+ * */

 int main(int argc, char *argv[])
 {
 int main(int argc, char *argv[])
 {

-       char *cf;
+       char *config_file;

        int ret, i;
        struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;
        int ret, i;
        struct sched s;
        struct command_task command_task_struct, *cmd_task = &command_task_struct;


@@ -1096,19 +1134,27 @@ int main(int argc, char *argv[])
        audiod_cmdline_parser(argc, argv, &conf);
        HANDLE_VERSION_FLAG("audiod", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);
        audiod_cmdline_parser(argc, argv, &conf);
        HANDLE_VERSION_FLAG("audiod", conf);
        para_drop_privileges(conf.user_arg, conf.group_arg);

-       cf = configfile_exists();
-       if (cf) {
-               if (audiod_cmdline_parser_configfile(cf, &conf, 0, 0, 0)) {
-                       PARA_EMERG_LOG("%s", "parse error in config file\n");
+       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("parse error in config file\n");

                        exit(EXIT_FAILURE);
                }
                        exit(EXIT_FAILURE);
                }

+               free(config_file);

        }
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
        log_welcome("para_audiod", conf.loglevel_arg);
        i = init_stream_io();
        if (i < 0) {
        }
        if (conf.logfile_given)
                logfile = open_log(conf.logfile_arg);
        log_welcome("para_audiod", conf.loglevel_arg);
        i = init_stream_io();
        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);
        }
        server_uptime(UPTIME_SET);
                exit(EXIT_FAILURE);
        }
        server_uptime(UPTIME_SET);


@@ -1133,8 +1179,8 @@ int main(int argc, char *argv[])
        register_task(audiod_task);
        s.default_timeout.tv_sec = 0;
        s.default_timeout.tv_usec = 99 * 1000;
        register_task(audiod_task);
        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;
 }