X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=23d184da551273595b127c45ffc041aba81f9565;hp=c2a383c1555eb53bf84fef487ec6ba622f9659b0;hb=9081daa84546dc48c0c521cb2081ef20c896e019;hpb=8aa9d0cddfefb882cfd8e7cadbeea5cce31b731f

diff --git a/play.c b/play.c
index c2a383c1..23d184da 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.
  */
@@ -184,10 +184,10 @@ static void parse_config_or_die(int argc, char *argv[])
 		loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	}
 	for (i = 0; i < conf.key_map_given; i++) {
-		char *s = strchr(conf.key_map_arg[i] + 1, ':');
-		if (s)
+		char *kma = conf.key_map_arg[i];
+		if (*kma && strchr(kma + 1, ':'))
 			continue;
-		PARA_EMERG_LOG("invalid key map arg: %s\n", conf.key_map_arg[i]);
+		PARA_EMERG_LOG("invalid key map arg: %s\n", kma);
 		goto err;
 	}
 	free(config_file);
@@ -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;
 }
 
@@ -1026,7 +1029,7 @@ static void sigint_handler(int sig)
  * stderr. Once the i9e subsystem has been initialized, we switch to the i9e
  * log facility.
  */
-static void session_open(__a_unused struct play_task *pt)
+static void session_open(struct play_task *pt)
 {
 	int ret;
 	char *history_file;