audiod: fix enum of supported audio formats
[paraslash.git] / audiod.c
index e298946..ed5344c 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -79,6 +79,7 @@ static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
 
 static struct status_task status_task_struct;
 struct status_task *stat_task = &status_task_struct;
+static struct timeval initial_delay_barrier;
 
 /**
  * the task for handling audiod commands
@@ -92,9 +93,15 @@ struct command_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;
 };
 
@@ -180,20 +187,15 @@ static void close_receiver(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
        struct audio_format_info *a;
-       const struct timeval restart_delay = {0, 200 * 1000};
 
        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);
-//     if (!s->receiver_node->eof)
-//             unregister_task(&s->receiver_node->task);
        a->receiver->close(s->receiver_node);
        free(s->receiver_node);
        s->receiver_node = NULL;
-       /* set restart barrier */
-       tv_add(now, &restart_delay, &afi[s->format].restart_barrier);
 }
 
 static void kill_all_decoders(void)
@@ -240,21 +242,6 @@ static int get_empty_slot(void)
        return -E_NO_MORE_SLOTS;
 }
 
-static int decoder_running(int format)
-{
-       int i, ret = 0;
-       struct slot_info *s;
-
-       FOR_EACH_SLOT(i) {
-               s = &slot[i];
-               if (s->format == format && s->receiver_node)
-                       ret |= 1;
-               if (s->format == format && s->wng)
-                       ret |= 2;
-       }
-       return ret;
-}
-
 static void close_stat_pipe(void)
 {
        int i;
@@ -399,22 +386,32 @@ static void open_writers(int slot_num)
 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);
+       }
 }
 
-static void open_receiver(int format)
+static int open_receiver(int format)
 {
        struct audio_format_info *a = &afi[format];
        struct slot_info *s;
        int ret, slot_num;
        struct receiver_node *rn;
+       const struct timeval restart_delay = {1, 0};
 
-       slot_num = get_empty_slot();
-       if (slot_num < 0)
-               clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num));
+       ret = get_empty_slot();
+       if (ret < 0)
+               goto err;
+       slot_num = ret;
        s = &slot[slot_num];
        s->format = format;
        s->receiver_node = para_calloc(sizeof(struct receiver_node));
@@ -423,11 +420,9 @@ static void open_receiver(int format)
        rn->conf = a->receiver_conf;
        ret = a->receiver->open(s->receiver_node);
        if (ret < 0) {
-               PARA_ERROR_LOG("failed to open receiver (%s)\n",
-                       PARA_STRERROR(-ret));
                free(s->receiver_node);
                s->receiver_node = NULL;
-               return;
+               goto err;
        }
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
                audio_formats[s->format], a->receiver->name, slot_num);
@@ -437,26 +432,45 @@ static void open_receiver(int format)
        rn->task.event_handler = rn_event_handler;
        sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
        register_task(&rn->task);
+       return 1;
+err:
+       PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+       tv_add(now, &restart_delay, &afi[format].restart_barrier);
+       return ret;
+}
+
+static int receiver_running(int format)
+{
+       int i;
+
+       FOR_EACH_SLOT(i) {
+               struct slot_info *s = &slot[i];
+               if (s->format == format && s->receiver_node
+                               && !s->receiver_node->eof)
+                       return 1;
+       }
+       return 0;
 }
 
 static int open_current_receiver(struct sched *s)
 {
        int i;
        struct timeval diff;
+       char *audio_format = stat_task->stat_item_values[SI_FORMAT];
 
-       if (!stat_task->af_status || !stat_task->pcd)
+       if (!audio_format || !stat_task->pcd)
                return 0;
-       i = get_audio_format_num(stat_task->af_status);
+       i = get_audio_format_num(audio_format + strlen(
+               status_item_list[SI_FORMAT]) + 1);
        if (i < 0)
                return 0;
-       if (decoder_running(i))
+       if (receiver_running(i))
                return 0;
        if (tv_diff(now, &afi[i].restart_barrier, &diff) < 0) {
                s->timeout = diff;
                return 0;
        }
-       open_receiver(i);
-       return 1;
+       return open_receiver(i) < 0? 0 : 1;
 }
 
 static void compute_time_diff(const struct timeval *status_time)
@@ -521,10 +535,6 @@ static void check_stat_line(char *line)
        case SI_STATUS:
                stat_task->playing = strstr(line, "playing")? 1 : 0;
                break;
-       case SI_FORMAT:
-               free(stat_task->af_status);
-               stat_task->af_status = para_strdup(line + ilen + 1);
-               break;
        case SI_OFFSET:
                stat_task->offset_seconds = atoi(line + ilen + 1);
                break;
@@ -533,8 +543,18 @@ static void check_stat_line(char *line)
                break;
        case SI_STREAM_START:
                if (sscanf(line + ilen + 1, "%lu.%lu", &sec, &usec) == 2) {
+                       struct timeval a_start, delay;
+                       delay.tv_sec = conf.stream_delay_arg / 1000;
+                       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);
                }
                break;
        case SI_CURRENT_TIME:
@@ -597,6 +617,7 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
        FOR_EACH_SLOT(i) {
                struct slot_info *sl = &slot[i];
                struct audio_format_info *a;
+               struct timeval diff;
 
                if (sl->format < 0)
                        continue;
@@ -615,9 +636,16 @@ static void audiod_pre_select(struct sched *s, __a_unused struct task *t)
                        s->timeout = min_delay;
                        continue;
                }
-               if (sl->fc && *sl->fc->out_loaded && !sl->wng) {
+               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("inital delay: %lu ms left\n", tv2ms(&diff));
+               if (tv_diff(&s->timeout, &diff, NULL) > 0) {
+                       s->timeout = diff;
                }
        }
 }
@@ -627,7 +655,6 @@ static void audiod_post_select(__a_unused struct sched *s,
 {
        int i;
 
-       /* save away the current time for other users */
        t->ret = 1;
        FOR_EACH_SLOT(i)
                try_to_close_slot(i);
@@ -723,18 +750,19 @@ static int init_receivers(void)
                PARA_INFO_LOG("initializing %s receiver\n", receivers[i].name);
                receivers[i].init(&receivers[i]);
        }
-       for (i = 0; i < conf.receiver_given; i++) {
+       for (i = conf.receiver_given - 1; i >= 0; i--) {
                char *arg = conf.receiver_arg[i];
-               char *recv = strchr(arg, ':');
+               char *recv_arg = strchr(arg, ':');
+               PARA_INFO_LOG("arg: %s\n", arg);
                ret = -E_MISSING_COLON;
-               if (!recv)
+               if (!recv_arg)
                        goto out;
-               *recv = '\0';
-               recv++;
+               *recv_arg = '\0';
+               recv_arg++;
                ret = get_audio_format_num(arg);
                if (ret < 0)
                        goto out;
-               afi[ret].receiver_conf = check_receiver_arg(recv, &receiver_num);
+               afi[ret].receiver_conf = check_receiver_arg(recv_arg, &receiver_num);
                if (!afi[ret].receiver_conf) {
                        ret = -E_RECV_SYNTAX;
                        goto out;
@@ -872,7 +900,7 @@ static int audiod_get_socket(void)
        return fd;
 }
 
-void signal_event_handler(struct task *t)
+static void signal_event_handler(struct task *t)
 {
        struct signal_task *st = t->private_data;
 
@@ -882,14 +910,14 @@ void signal_event_handler(struct task *t)
                handle_signal(st->signum);
 }
 
-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;
        para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-void signal_post_select(struct sched *s, struct task *t)
+static void signal_post_select(struct sched *s, struct task *t)
 {
        struct signal_task *st = t->private_data;
        t->ret = 1;
@@ -899,7 +927,7 @@ void signal_post_select(struct sched *s, struct task *t)
        st->signum = para_next_signal();
 }
 
-void signal_setup_default(struct signal_task *st)
+static void signal_setup_default(struct signal_task *st)
 {
        st->task.pre_select = signal_pre_select;
        st->task.post_select = signal_post_select;
@@ -921,8 +949,7 @@ static void command_post_select(struct sched *s, struct task *t)
        struct command_task *ct = t->private_data;
 
        t->ret = 1; /* always successful */
-       if (audiod_status != AUDIOD_OFF)
-               audiod_status_dump();
+       audiod_status_dump();
        if (!FD_ISSET(ct->fd, &s->rfds))
                return;
        ret = handle_connect(ct->fd);
@@ -988,13 +1015,22 @@ static void status_pre_select(struct sched *s, struct task *t)
 static void status_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct status_task *st = t->private_data;
+       unsigned bytes_left;
 
        t->ret = 1;
-       if (!st->pcd || !st->pcd->loaded
-                       || st->pcd->status != CL_RECEIVING)
+       if (!st->pcd || st->pcd->status != CL_RECEIVING)
                return;
-       st->pcd->loaded = for_each_line(st->pcd->buf, st->pcd->loaded,
+       bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded,
                &check_stat_line);
+       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)
+                       close_stat_pipe();
+       }
 }
 
 static void init_status_task(struct status_task *st)