task_register() conversion: vss task

[paraslash.git] / play.c

diff --git a/play.c b/play.c
index 045f26038b46512f4eebfdf5bf80659c79f4fd87..f4202d2865c4357365a44f6ede33c8128be00568 100644 (file)
--- a/play.c
+++ b/play.c
@@ -57,7 +57,7 @@ enum state_change_request_type {
 };
 
 struct play_task {
-       struct task task;
+       struct task *task;
        /* A bit array of invalid files (those will be skipped). */
        bool *invalid;
        /* The file which is currently open. */
@@ -243,8 +243,11 @@ static void wipe_receiver_node(struct play_task *pt)
 /* returns: 0 not eof, 1: eof, < 0: fatal error.  */
 static int get_playback_error(struct play_task *pt)
 {
-       int err = pt->wn.task.error;
+       int err;
 
+       if (!pt->wn.task)
+               return 0;
+       err = pt->wn.task->error;
        if (err >= 0)
                return 0;
        if (pt->fn.task->error >= 0)
@@ -267,6 +270,7 @@ static int eof_cleanup(struct play_task *pt)
        if (ret == 0)
                return ret;
        PARA_NOTICE_LOG("cleaning up wn/fn nodes\n");
+       task_reap(&pt->wn.task);
        w->close(&pt->wn);
        btr_remove_node(&pt->wn.btrn);
        w->free_config(pt->wn.conf);
@@ -397,7 +401,6 @@ static int load_file(struct play_task *pt)
 
        /* setup default writer */
        pt->wn.conf = check_writer_arg_or_die(NULL, &pt->wn.writer_num);
-       pt->wn.task.error = 0;
 
        /* success, register tasks */
        pt->rn.task = task_register(
@@ -460,7 +463,8 @@ again:
 
 static void kill_stream(struct play_task *pt)
 {
-       task_notify(&pt->wn.task, E_EOF);
+       if (pt->wn.task)
+               task_notify(pt->wn.task, E_EOF);
 }
 
 #ifdef HAVE_READLINE
@@ -1093,7 +1097,7 @@ static void session_update_time_string(struct play_task *pt, char *str, unsigned
  */
 static int session_post_select(__a_unused struct sched *s, struct task *t)
 {
-       struct play_task *pt = container_of(t, struct play_task, task);
+       struct play_task *pt = task_context(t);
        int ret;
 
        if (pt->background)
@@ -1117,7 +1121,7 @@ static int session_post_select(__a_unused struct sched *s, struct task *t)
 
 static int session_post_select(struct sched *s, struct task *t)
 {
-       struct play_task *pt = container_of(t, struct play_task, task);
+       struct play_task *pt = task_context(t);
        char c;
 
        if (!FD_ISSET(STDIN_FILENO, &s->rfds))
@@ -1142,7 +1146,7 @@ static void session_update_time_string(__a_unused struct play_task *pt,
 
 static void play_pre_select(struct sched *s, struct task *t)
 {
-       struct play_task *pt = container_of(t, struct play_task, task);
+       struct play_task *pt = task_context(t);
        char state;
 
        para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
@@ -1181,7 +1185,7 @@ static unsigned get_time_string(struct play_task *pt, char **result)
 
 static int play_post_select(struct sched *s, struct task *t)
 {
-       struct play_task *pt = container_of(t, struct play_task, task);
+       struct play_task *pt = task_context(t);
        int ret;
 
        ret = eof_cleanup(pt);
@@ -1253,10 +1257,12 @@ int main(int argc, char *argv[])
        pt->rq = CRT_FILE_CHANGE;
        pt->current_file = conf.inputs_num - 1;
        pt->playing = true;
-       pt->task.pre_select = play_pre_select;
-       pt->task.post_select = play_post_select;
-       sprintf(pt->task.status, "play task");
-       register_task(&sched, &pt->task);
+       pt->task = task_register(&(struct task_info){
+               .name = "play",
+               .pre_select = play_pre_select,
+               .post_select = play_post_select,
+               .context = pt,
+       }, &sched);
        ret = schedule(&sched);
        sched_shutdown(&sched);
        if (ret < 0)