X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=4fb2050019d2dbfeee61c660bd7f7fa3c4e086fe;hp=cf7c5a302d2cac9e96fd3793778733f874d3e267;hb=56d75bd90d78cf44cd3984ce2a45627ef5646d38;hpb=879e52d49df6d00aa9eafe5cccb48bbd24ed4c81 diff --git a/play.c b/play.c index cf7c5a30..4fb20500 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. */ @@ -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,9 +633,6 @@ static char **get_mapped_keyseqs(void) return result; } -#include "play_completion.h" - - /* defines one command of para_play */ struct pp_command { const char *name; @@ -645,11 +642,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 +869,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 +885,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 +1239,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);