X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=7593a69b25123d6983d39de373c3399a4ec78d51;hp=c2a383c1555eb53bf84fef487ec6ba622f9659b0;hb=c0162946c2124d1afd09bc7fc3b0aa4bb386f9f8;hpb=c1b282afb8e8422d12ae01a77937f27281748f1b diff --git a/play.c b/play.c index c2a383c1..7593a69b 100644 --- a/play.c +++ b/play.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Andre Noll + * Copyright (C) 2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -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; } @@ -918,6 +921,8 @@ static int com_jmp(struct play_task *pt, int argc, char **argv) return ret; if (percent < 0 || percent > 100) return -ERRNO_TO_PARA_ERROR(EINVAL); + if (percent == 100) + return com_next(pt, 1, (char *[]){"next", NULL}); if (pt->playing && !pt->fn.btrn) return 0; pt->start_chunk = percent * pt->num_chunks / 100;