Switch audiod over to the buffer tree API.
[paraslash.git] / audiod.c
index d946093..db7ae8a 100644 (file)
--- a/audiod.c
+++ b/audiod.c
@@ -180,9 +180,12 @@ char *get_time_string(int slot_num)
 {
        int ret, seconds = 0, length;
        struct timeval *tmp, sum, sss, /* server stream start */
+               rstime, /* receiver start time */
+               wstime, /* writer start time */
                wtime, /* now - writer start */
                rskip; /* receiver start - sss */
        struct slot_info *s = slot_num < 0? NULL : &slot[slot_num];
+       char *msg;
 
        if (audiod_status == AUDIOD_OFF)
                goto empty;
@@ -194,7 +197,7 @@ char *get_time_string(int slot_num)
        if (audiod_status == AUDIOD_ON && !s)
                goto empty;
        /* valid status items and playing */
-       if (s) { /* writer active in this slot */
+       if (s && s->wns) { /* writer active in this slot */
                length = s->seconds_total;
                tmp = &s->server_stream_start;
        } else { /* standby mode, rely on status items */
@@ -205,15 +208,18 @@ char *get_time_string(int slot_num)
                tv_diff(tmp, &stat_task->sa_time_diff, &sss);
        else
                tv_add(tmp, &stat_task->sa_time_diff, &sss);
-       if (!s) {
+       if (!s || !s->wns) {
                struct timeval diff;
                tv_diff(now, &sss, &diff);
                seconds = diff.tv_sec + stat_task->offset_seconds;
                goto out;
        }
-       tv_diff(now, &s->wstime, &wtime);
+       btr_get_node_start(s->wns[0].btrn, &wstime);
+       tv_diff(now, &wstime, &wtime);
+       //PARA_CRIT_LOG("offset %d\n", s->offset_seconds);
        seconds = s->offset_seconds;
-       ret = tv_diff(&s->rstime, &sss, &rskip);
+       btr_get_node_start(s->receiver_node->btrn, &rstime);
+       ret = tv_diff(&rstime, &sss, &rskip);
        if (ret > 0) { /* audiod was started in the middle of the stream */
                tv_add(&wtime, &rskip, &sum);
                seconds += sum.tv_sec;
@@ -222,7 +228,7 @@ char *get_time_string(int slot_num)
 out:
        seconds = PARA_MIN(seconds, length);
        seconds = PARA_MAX(seconds, 0);
-       return make_message(
+       msg = make_message(
                "%s%d:%02d [%d:%02d] (%d%%/%d:%02d)",
                s? "" : "~",
                seconds / 60,
@@ -233,6 +239,8 @@ out:
                length / 60,
                length % 60
        );
+       PARA_DEBUG_LOG("slot %d: %s\n", slot_num, msg);
+       return msg;
 empty:
        return para_strdup(NULL);
 }
@@ -312,30 +320,73 @@ static void close_receiver(int slot_num)
        PARA_NOTICE_LOG("closing %s receiver in slot %d\n",
                audio_formats[s->format], slot_num);
        a->receiver->close(s->receiver_node);
+       btr_free_node(s->receiver_node->btrn);
        free(s->receiver_node);
        s->receiver_node = NULL;
        stat_task->current_audio_format_num = -1;
 }
 
-static void kill_all_decoders(int error)
+static void writer_cleanup(struct writer_node *wn)
+{
+       struct writer *w = writers + wn->writer_num;
+
+       w->close(wn);
+       btr_free_node(wn->btrn);
+}
+
+static void close_writers(struct slot_info *s)
+{
+       struct audio_format_info *a;
+       int i;
+
+       if (s->format < 0)
+               return;
+       a = afi + s->format;
+       if (a->num_writers == 0)
+               writer_cleanup(s->wns);
+       else {
+               for (i = 0; i < a->num_writers; i++)
+                       writer_cleanup(s->wns + i);
+       }
+       free(s->wns);
+       s->wns = NULL;
+}
+
+static void _close_filters(struct slot_info *s)
 {
        int i;
+       struct audio_format_info *a = afi + s->format;
+       if (a->num_filters == 0)
+               return;
+       for (i = 0; i < a->num_filters; i++) {
+               struct filter_node *fn = s->fns + i;
+               struct filter *f = filters + fn->filter_num;
+
+               f->close(fn);
+               btr_free_node(fn->btrn);
+       }
+       free(s->fns);
+       s->fns = NULL;
+}
+
+static void kill_all_decoders(int error)
+{
+       int i, j;
 
        FOR_EACH_SLOT(i) {
                struct slot_info *s = &slot[i];
-               if (s->wng && s->wng->task.error >= 0) {
-                       PARA_INFO_LOG("deactivating wng in slot %d\n",
-                               i);
-                       s->wng->task.error = error;
-               }
-               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->task.error >= 0) {
-                       PARA_INFO_LOG("deactivating receiver_node in slot %d\n", i);
+               struct audio_format_info *a;
+               if (s->format < 0)
+                       continue;
+               a = afi + s->format;
+               if (s->wns)
+                       for (j = 0; j < a->num_writers; j++)
+                               s->wns[j].task.error = error;
+               if (s->fns)
+                       for (j = 0; j < a->num_writers; j++)
+                               s->fns[j].task.error = error;
+               if (s->receiver_node)
                        s->receiver_node->task.error = error;
-               }
        }
 }
 
@@ -350,7 +401,7 @@ static int get_empty_slot(void)
                        clear_slot(i);
                        return i;
                }
-               if (s->wng || s->receiver_node || s->fc)
+               if (s->wns || s->receiver_node || s->fns)
                        continue;
                clear_slot(i);
                return i;
@@ -372,90 +423,71 @@ int num_filters(int audio_format_num)
        return afi[audio_format_num].num_filters;
 }
 
-static void open_filters(int slot_num)
+static void open_filters(struct slot_info *s)
 {
-       struct slot_info *s = &slot[slot_num];
-       struct audio_format_info *a = &afi[s->format];
+       struct audio_format_info *a = afi + s->format;
        struct filter_node *fn;
        int nf = a->num_filters;
+       struct btr_node *parent;
        int i;
 
-       s->fc = NULL;
-       if (!nf)
+       if (nf == 0)
                return;
        PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
-       s->fc = para_calloc(sizeof(struct filter_chain));
-       s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_node));
-       s->fc->inbufp = &s->receiver_node->buf;
-       s->fc->in_loaded = &s->receiver_node->loaded;
-       s->fc->input_error = &s->receiver_node->task.error;
-       s->fc->task.pre_select = NULL;
-       s->fc->task.post_select = filter_post_select;
-       s->fc->task.error = 0;
-       s->fc->num_filters = nf;
-
-       s->receiver_node->output_error = &s->fc->task.error;
-       sprintf(s->fc->task.status, "filter chain");
-       FOR_EACH_FILTER_NODE(fn, s->fc, i) {
+       assert(s->fns == NULL);
+       s->fns = para_calloc(nf * sizeof(struct filter_node));
+       parent = s->receiver_node->btrn;
+       for (i = 0; i < nf; i++) {
                struct filter *f = filters + a->filter_nums[i];
+               fn = s->fns + i;
                fn->filter_num = a->filter_nums[i];
                fn->conf = a->filter_conf[i];
-               fn->fc = s->fc;
-               fn->loaded = 0;
-               INIT_LIST_HEAD(&fn->callbacks);
+               fn->task.pre_select = f->pre_select;
+               fn->task.post_select = f->post_select;
+               fn->btrn = btr_new_node(f->name, parent, f->execute, fn);
                f->open(fn);
+               register_task(&fn->task);
+               parent = fn->btrn;
                PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
-                       audio_formats[s->format], i,  nf, f->name, slot_num);
-               s->fc->outbufp = &fn->buf;
-               s->fc->out_loaded = &fn->loaded;
+                       audio_formats[s->format], i,  nf, f->name, s - slot);
+               sprintf(fn->task.status, "%s (slot %d)", f->name, s - slot);
        }
-       register_task(&s->fc->task);
 }
 
-static void open_writers(int slot_num)
+static void open_writers(struct slot_info *s)
 {
-       int ret, i;
-       struct slot_info *s = &slot[slot_num];
-       struct audio_format_info *a = &afi[s->format];
-
-       PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]);
-       if (!a->num_writers)
-               s->wng = setup_default_wng();
-       else
-               s->wng = wng_new(a->num_writers);
-       if (s->fc) {
-               s->wng->bufp = s->fc->outbufp;
-               s->wng->loaded = s->fc->out_loaded;
-               s->wng->input_error = &s->fc->task.error;
-               s->wng->channels = &s->fc->channels;
-               s->wng->samplerate = &s->fc->samplerate;
-               s->fc->output_error = &s->wng->task.error;
-               PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
-       } else {
-               s->wng->bufp = &s->receiver_node->buf;
-               s->wng->loaded = &s->receiver_node->loaded;
-               s->wng->input_error = &s->receiver_node->task.error;
-       }
-       for (i = 0; i < a->num_writers; i++) {
-               s->wng->writer_nodes[i].conf = a->writer_conf[i];
-               s->wng->writer_nodes[i].writer_num = a->writer_nums[i];
+       int i;
+       struct audio_format_info *a = afi + s->format;
+       struct writer_node *wn;
+       struct btr_node *parent = s->fns[a->num_filters - 1].btrn;
+
+       assert(s->wns == NULL);
+       s->wns = para_calloc(PARA_MAX(1U, a->num_writers)
+               * sizeof(struct writer_node));
+       if (a->num_writers == 0)
+               setup_writer_node(NULL, parent, s->wns);
+       else {
+               PARA_INFO_LOG("opening %s writers\n", audio_formats[s->format]);
+               for (i = 0; i < a->num_writers; i++) {
+                       wn = s->wns + i;
+                       wn->conf = a->writer_conf[i];
+                       wn->writer_num = a->writer_nums[i];
+                       register_writer_node(wn, parent);
+               }
        }
-       ret = wng_open(s->wng);
-       if (ret < 0)
-               return;
-       s->wstime = *now;
        s->server_stream_start = stat_task->server_stream_start.tv_sec?
                stat_task->server_stream_start : *now;
        s->offset_seconds = stat_task->offset_seconds;
        s->seconds_total = stat_task->length_seconds;
-       activate_inactive_grab_clients(s->format, s->fc);
 }
 
+/* returns slot num on success */
 static int open_receiver(int format)
 {
        struct audio_format_info *a = &afi[format];
        struct slot_info *s;
        int ret, slot_num;
+       struct receiver *r = a->receiver;
        struct receiver_node *rn;
        const struct timeval restart_delay = {2, 0};
 
@@ -467,22 +499,23 @@ static int open_receiver(int format)
        s->format = format;
        s->receiver_node = para_calloc(sizeof(struct receiver_node));
        rn = s->receiver_node;
-       rn->receiver = a->receiver;
+       rn->receiver = r;
        rn->conf = a->receiver_conf;
-       ret = a->receiver->open(s->receiver_node);
+       rn->btrn = btr_new_node(r->name, NULL, NULL, rn);
+       ret = r->open(rn);
        if (ret < 0) {
-               free(s->receiver_node);
+               btr_free_node(rn->btrn);
+               free(rn);
                s->receiver_node = NULL;
                goto err;
        }
        PARA_NOTICE_LOG("started %s: %s receiver in slot %d\n",
-               audio_formats[s->format], a->receiver->name, slot_num);
-       rn->task.pre_select = a->receiver->pre_select;
-       rn->task.post_select = a->receiver->post_select;
-       s->rstime = *now;
-       sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
+               audio_formats[s->format], r->name, slot_num);
+       rn->task.pre_select = r->pre_select;
+       rn->task.post_select = r->post_select;
+       sprintf(rn->task.status, "%s receiver node", r->name);
        register_task(&rn->task);
-       ret = 1;
+       ret = slot_num;
 err:
        if (ret < 0)
                PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -508,19 +541,20 @@ static int receiver_running(int format)
        return ret;
 }
 
-static void open_current_receiver(struct sched *s)
+/* returns slot num on success. */
+static int open_current_receiver(struct sched *s)
 {
        struct timeval diff;
        int ret, cafn = stat_task->current_audio_format_num;
 
        if (cafn < 0 || !stat_task->ct)
-               return;
+               return -1;
        /* Do nothing if the 'N' flag is set or the 'P' flag is unset */
        if (stat_task->vss_status != VSS_STATUS_FLAG_PLAYING)
-               return;
+               return -1;
        ret = receiver_running(cafn);
        if (ret > 0) /* already running and not eof */
-               return;
+               return -1;
        if (ret < 0) { /* eof */
                /*
                 * para_server uses a zero start time during the announcement
@@ -528,16 +562,19 @@ static void open_current_receiver(struct sched *s)
                 * this period begins to avoid restarting the receiver that
                 * belongs to the file just completed.
                 */
-               if (stat_task->server_stream_start.tv_sec)
-                       return;
+               PARA_CRIT_LOG("->>>>>>>>>>>>>>>>>> no delay\n");
+               if (stat_task->server_stream_start.tv_sec != 0) {
+                       PARA_CRIT_LOG("->>>>>>>>>>>>>>>>>><delay\n");
+                       return -1;
+               }
        }
        if (tv_diff(now, &afi[cafn].restart_barrier, &diff) < 0) {
                /* avoid busy loop */
                s->timeout = diff;
-               return;
+               return -1;
        }
        /* start a new receiver */
-       open_receiver(cafn);
+       return open_receiver(cafn);
 }
 
 static unsigned compute_time_diff(const struct timeval *status_time)
@@ -906,9 +943,9 @@ static void command_post_select(struct sched *s, struct task *t)
        int ret;
        struct command_task *ct = container_of(t, struct command_task, task);
        static struct timeval last_status_dump;
-       struct timeval tmp;
+       struct timeval tmp, delay = {0, 500 * 1000};
 
-       tv_add(&last_status_dump, &(struct timeval){0, 500 * 1000}, &tmp);
+       tv_add(&last_status_dump, &delay, &tmp);
        if (tv_diff(&tmp, now, NULL) < 0) {
                audiod_status_dump();
                last_status_dump = *now;
@@ -975,19 +1012,22 @@ static void set_stat_task_restart_barrier(unsigned seconds)
 static void try_to_close_slot(int slot_num)
 {
        struct slot_info *s = &slot[slot_num];
+       struct audio_format_info *a = afi + s->format;
+       int i;
 
        if (s->format < 0)
                return;
        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;
+       for (i = 0; i < a->num_filters; i++)
+               if (s->fns && s->fns[i].task.error != -E_TASK_UNREGISTERED)
+                       return;
+       for (i = 0; i < a->num_writers; i++)
+               if (s->wns && s->wns[i].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_writers(s);
+       _close_filters(s);
        close_receiver(slot_num);
        clear_slot(slot_num);
 }
@@ -998,50 +1038,28 @@ static void try_to_close_slot(int slot_num)
  */
 static void start_stop_decoders(struct sched *s)
 {
-       int i;
+       int i, ret;
+       struct slot_info *sl;
+       struct audio_format_info *a;
 
        FOR_EACH_SLOT(i)
                try_to_close_slot(i);
-       if (audiod_status != AUDIOD_ON ||
-                       !(stat_task->vss_status & VSS_STATUS_FLAG_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;
-
-               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;
-               }
-       }
+//     if (audiod_status != AUDIOD_ON ||
+//                     !(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
+//             return kill_all_decoders(-E_NOT_PLAYING);
+       ret = open_current_receiver(s);
+       if (ret < 0)
+               return;
+       sl = slot + ret;
+       a = afi + sl->format;
+       if (a->num_filters)
+               open_filters(sl);
+       open_writers(sl);
+       btr_log_tree(sl->receiver_node->btrn, LL_NOTICE);
+       s->timeout.tv_sec = 0;
+       s->timeout.tv_usec = 1;
 }
 
-
 /* restart the client task if necessary */
 static void status_pre_select(struct sched *s, struct task *t)
 {
@@ -1240,7 +1258,7 @@ int main(int argc, char *argv[])
        register_task(&sig_task->task);
        register_task(&cmd_task->task);
        register_task(&stat_task->task);
-       s.default_timeout.tv_sec = 0;
+       s.default_timeout.tv_sec = 2;
        s.default_timeout.tv_usec = 999 * 1000;
        ret = schedule(&s);