From a713c13d1089170828403e98c57d3fba9aedf9a4 Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Tue, 15 Apr 2014 13:49:59 +0000 Subject: [PATCH] task_register() conversion: play task --- play.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/play.c b/play.c index 2c6feeda..f4202d28 100644 --- 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. */ @@ -1097,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) @@ -1121,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)) @@ -1146,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); @@ -1185,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); @@ -1257,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) -- 2.39.5