X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=61c30aed08b131384e099a945cfed3011b9a0f97;hp=cf7c5a302d2cac9e96fd3793778733f874d3e267;hb=fdb03951ee708a42795d4abb36d3a8637c478975;hpb=879e52d49df6d00aa9eafe5cccb48bbd24ed4c81

diff --git a/play.c b/play.c
index cf7c5a30..61c30aed 100644
--- a/play.c
+++ b/play.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2014 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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,23 +633,24 @@ static char **get_mapped_keyseqs(void)
 	return result;
 }
 
-#include "play_completion.h"
+#include "play.command_list.h"
 
+typedef int play_command_handler_t(struct play_task *, int, char**);
+static play_command_handler_t PLAY_COMMAND_HANDLERS;
 
 /* defines one command of para_play */
 struct pp_command {
 	const char *name;
-	int (*handler)(struct play_task *, int, char**);
+	play_command_handler_t *handler;
 	const char *description;
 	const char *usage;
 	const char *help;
 };
 
-#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 +873,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 +889,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;
 }
 
@@ -1240,7 +1243,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);