X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=5736a2ddbdfc04199f6d2bf6544f9ce2d35a56f8;hp=35b25119c71e10972737159439c271bf43ac90e4;hb=2b8250e7d8b4bb34727470ee208fc9b725371bec;hpb=aa74a903545250506fd4c29791e6f4aef3a01c41 diff --git a/play.c b/play.c index 35b25119..5736a2dd 100644 --- a/play.c +++ b/play.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 Andre Noll + * Copyright (C) 2012-2014 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -144,6 +144,7 @@ __noreturn static void print_help_and_die(void) GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS; ggo_print_help(&help, flags); + printf("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS); exit(0); } @@ -430,7 +431,7 @@ static int load_next_file(struct play_task *pt) int ret; again: - if (pt->rq == CRT_NONE || pt->rq == CRT_FILE_CHANGE) { + if (pt->rq == CRT_NONE) { pt->start_chunk = 0; ret = next_valid_file(pt); if (ret < 0) @@ -973,15 +974,7 @@ out: static int play_i9e_line_handler(char *line) { - struct play_task *pt = &play_task; - int ret; - - if (line == NULL || !*line) - return 0; - ret = run_command(line, pt); - if (ret < 0) - return ret; - return 0; + return run_command(line, &play_task); } static int play_i9e_key_handler(int key)