X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=ed1c6fefb84a060458714b77388e79183bdca762;hp=01125ab647f73482bb248ecdbaac2b8b2ad13021;hb=abfb661f35e99e99c09a94d84839356d905af080;hpb=e66a7267ca6cc374496dda803c6f9fdb631e99c0

diff --git a/play.c b/play.c
index 01125ab6..ed1c6fef 100644
--- a/play.c
+++ b/play.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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,13 +243,16 @@ 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 = task_status(pt->wn.task);
 	if (err >= 0)
 		return 0;
-	if (pt->fn.task.error >= 0)
+	if (task_status(pt->fn.task) >= 0)
 		return 0;
-	if (pt->rn.task.error >= 0)
+	if (task_status(pt->rn.task) >= 0)
 		return 0;
 	if (err == -E_BTR_EOF || err == -E_RECV_EOF || err == -E_EOF
 			|| err == -E_WRITE_COMMON_EOF)
@@ -267,16 +270,19 @@ 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);
 	memset(&pt->wn, 0, sizeof(struct writer_node));
 
+	task_reap(&pt->fn.task);
 	decoder->close(&pt->fn);
 	btr_remove_node(&pt->fn.btrn);
 	free(pt->fn.conf);
 	memset(&pt->fn, 0, sizeof(struct filter_node));
 
+	task_reap(&pt->rn.task);
 	btr_remove_node(&pt->rn.btrn);
 	/*
 	 * On eof (ret > 0), we do not wipe the receiver node struct until a
@@ -295,7 +301,7 @@ static int shuffle_compare(__a_unused const void *a, __a_unused const void *b)
 
 static void shuffle(char **base, size_t num)
 {
-	srandom(now->tv_sec);
+	srandom(time(NULL));
 	qsort(base, num, sizeof(char *), shuffle_compare);
 }
 
@@ -351,9 +357,6 @@ static int open_new_file(struct play_task *pt)
 		free(tmp);
 		tmp = NULL;
 	}
-	pt->rn.task.pre_select = afh_recv->pre_select;
-	pt->rn.task.post_select = afh_recv->post_select;
-	sprintf(pt->rn.task.status, "%s receiver node", afh_recv->name);
 	return 1;
 fail:
 	wipe_receiver_node(pt);
@@ -363,7 +366,7 @@ fail:
 static int load_file(struct play_task *pt)
 {
 	const char *af;
-	char *tmp;
+	char *tmp, buf[20];
 	int ret;
 	struct filter *decoder;
 
@@ -373,7 +376,6 @@ static int load_file(struct play_task *pt)
 		if (ret < 0)
 			return ret;
 	} else {
-		char buf[20];
 		pt->rn.btrn = new_recv_btrn(&pt->rn);
 		sprintf(buf, "repos %lu", pt->start_chunk);
 		ret = btr_exec_up(pt->rn.btrn, buf, &tmp);
@@ -392,9 +394,6 @@ static int load_file(struct play_task *pt)
 		goto fail;
 	pt->fn.filter_num = ret;
 	decoder = filters + ret;
-	pt->fn.task.pre_select = decoder->pre_select;
-	pt->fn.task.post_select = decoder->post_select;
-	sprintf(pt->fn.task.status, "%s decoder", af);
 	pt->fn.btrn = btr_new_node(&(struct btr_node_description)
 		EMBRACE(.name = decoder->name, .parent = pt->rn.btrn,
 			.handler = decoder->execute, .context = &pt->fn));
@@ -402,11 +401,23 @@ 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 */
-	register_task(&sched, &pt->rn.task);
-	register_task(&sched, &pt->fn.task);
+	pt->rn.task = task_register(
+		&(struct task_info) {
+			.name = afh_recv->name,
+			.pre_select = afh_recv->pre_select,
+			.post_select = afh_recv->post_select,
+			.context = &pt->rn
+		}, &sched);
+	sprintf(buf, "%s decoder", af);
+	pt->fn.task = task_register(
+		&(struct task_info) {
+			.name = buf,
+			.pre_select = decoder->pre_select,
+			.post_select = decoder->post_select,
+			.context = &pt->fn
+		}, &sched);
 	register_writer_node(&pt->wn, pt->fn.btrn, &sched);
 	return 1;
 fail:
@@ -452,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
@@ -860,6 +872,7 @@ static int com_prev(struct play_task *pt, int argc, __a_unused char **argv)
 	kill_stream(pt);
 	pt->next_file = ret;
 	pt->rq = CRT_FILE_CHANGE;
+	pt->start_chunk = 0;
 	return 0;
 }
 
@@ -875,6 +888,7 @@ static int com_next(struct play_task *pt, int argc, __a_unused char **argv)
 	kill_stream(pt);
 	pt->next_file = ret;
 	pt->rq = CRT_FILE_CHANGE;
+	pt->start_chunk = 0;
 	return 0;
 }
 
@@ -1083,9 +1097,8 @@ static void session_update_time_string(struct play_task *pt, char *str, unsigned
  * terminates. Subsequent calls to i9e_get_error() then return negative and we
  * are allowed to call i9e_close() and terminate as well.
  */
-static int session_post_select(__a_unused struct sched *s, struct task *t)
+static int session_post_select(__a_unused struct sched *s, struct play_task *pt)
 {
-	struct play_task *pt = container_of(t, struct play_task, task);
 	int ret;
 
 	if (pt->background)
@@ -1107,9 +1120,8 @@ static int session_post_select(__a_unused struct sched *s, struct task *t)
 
 #else /* HAVE_READLINE */
 
-static int session_post_select(struct sched *s, struct task *t)
+static int session_post_select(struct sched *s, struct play_task *pt)
 {
-	struct play_task *pt = container_of(t, struct play_task, task);
 	char c;
 
 	if (!FD_ISSET(STDIN_FILENO, &s->rfds))
@@ -1132,9 +1144,9 @@ static void session_update_time_string(__a_unused struct play_task *pt,
 }
 #endif /* HAVE_READLINE */
 
-static void play_pre_select(struct sched *s, struct task *t)
+static void play_pre_select(struct sched *s, void *context)
 {
-	struct play_task *pt = container_of(t, struct play_task, task);
+	struct play_task *pt = context;
 	char state;
 
 	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
@@ -1171,9 +1183,9 @@ static unsigned get_time_string(struct play_task *pt, char **result)
 	);
 }
 
-static int play_post_select(struct sched *s, struct task *t)
+static int play_post_select(struct sched *s, void *context)
 {
-	struct play_task *pt = container_of(t, struct play_task, task);
+	struct play_task *pt = context;
 	int ret;
 
 	ret = eof_cleanup(pt);
@@ -1181,7 +1193,7 @@ static int play_post_select(struct sched *s, struct task *t)
 		pt->rq = CRT_TERM_RQ;
 		return 0;
 	}
-	ret = session_post_select(s, t);
+	ret = session_post_select(s, pt);
 	if (ret < 0)
 		goto out;
 	if (!pt->wn.btrn && !pt->fn.btrn) {
@@ -1230,7 +1242,6 @@ int main(int argc, char *argv[])
 	filter_init();
 	writer_init();
 
-	clock_get_realtime(now);
 	sched.default_timeout.tv_sec = 5;
 
 	parse_config_or_die(argc, argv);
@@ -1245,11 +1256,14 @@ 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)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;