X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=02128af0582aba2f724d70a459b427b096797a39;hb=f8931d4607fdf8cb98761b9814d068256d2925a3;hp=fb72bae43e3a921f8acc6d85082e29d0ed19f20f;hpb=24758c5f17064273786e704b84ceff56c234e347;p=paraslash.git diff --git a/play.c b/play.c index fb72bae4..02128af0 100644 --- a/play.c +++ b/play.c @@ -990,15 +990,7 @@ out: static int play_i9e_line_handler(char *line) { - struct play_task *pt = &play_task; - int ret; - - if (line == NULL || !*line) - return 0; - ret = run_command(line, pt); - if (ret < 0) - return ret; - return 0; + return run_command(line, &play_task); } static int play_i9e_key_handler(int key) @@ -1195,7 +1187,7 @@ static unsigned get_time_string(struct play_task *pt, char **result) ); } -static void play_post_select(struct sched *s, struct task *t) +static int play_post_select(struct sched *s, struct task *t) { struct play_task *pt = container_of(t, struct play_task, task); int ret; @@ -1203,7 +1195,7 @@ static void play_post_select(struct sched *s, struct task *t) ret = eof_cleanup(pt); if (ret < 0) { pt->rq = CRT_TERM_RQ; - return; + return 0; } ret = session_post_select(s, t); if (ret < 0) @@ -1233,7 +1225,7 @@ static void play_post_select(struct sched *s, struct task *t) } ret = 1; out: - t->error = ret; + return ret; } /**