X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=90207520f5dc1eb21c38c706cf0bd8384de83e69;hp=2c6feeda593771baf5e4213859a1cabae29917ce;hb=d1e7875caba9aface190dab0de394435a80edd21;hpb=c5056b00502d27e602cfcd716f92e5f85f97b470

diff --git a/play.c b/play.c
index 2c6feeda..90207520 100644
--- a/play.c
+++ b/play.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 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. */
@@ -247,12 +247,12 @@ static int get_playback_error(struct play_task *pt)
 
 	if (!pt->wn.task)
 		return 0;
-	err = pt->wn.task->error;
+	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)
@@ -301,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);
 }
 
@@ -633,7 +633,7 @@ static char **get_mapped_keyseqs(void)
 	return result;
 }
 
-#include "play_completion.h"
+#include "play.completion.h"
 
 
 /* defines one command of para_play */
@@ -645,11 +645,11 @@ struct pp_command {
 	const char *help;
 };
 
-#include "play_command_list.h"
+#include "play.command_list.h"
 static struct pp_command pp_cmds[] = {DEFINE_PLAY_CMD_ARRAY};
 #define FOR_EACH_COMMAND(c) for (c = 0; pp_cmds[c].name; c++)
 
-#include "play_completion.h"
+#include "play.completion.h"
 static struct i9e_completer pp_completers[];
 
 I9E_DUMMY_COMPLETER(jmp);
@@ -872,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;
 }
 
@@ -887,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;
 }
 
@@ -1095,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)
@@ -1119,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))
@@ -1144,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);
@@ -1183,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);
@@ -1193,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) {
@@ -1242,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);
@@ -1257,10 +1256,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)