X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=01125ab647f73482bb248ecdbaac2b8b2ad13021;hp=7c1ee93259ce6bd800daed3600ce7aae3400ffd9;hb=3ac2a1478a7ad965bb48bec7d21aa49affd95d29;hpb=b59e0eeefe6b51a26c1165f587bf3776369460a5

diff --git a/play.c b/play.c
index 7c1ee932..01125ab6 100644
--- a/play.c
+++ b/play.c
@@ -139,16 +139,12 @@ static void check_afh_receiver_or_die(void)
 
 __noreturn static void print_help_and_die(void)
 {
-	int d = conf.detailed_help_given;
-	const char **p = d? play_args_info_detailed_help
-		: play_args_info_help;
-
-	printf_or_die("%s\n\n", version_single_line("play"));
-	printf_or_die("%s\n\n", play_args_info_usage);
-	if (d)
-		printf_or_die("%s\n", play_args_info_description);
-	for (; *p; p++)
-		printf_or_die("%s\n", *p);
+	struct ggo_help help = DEFINE_GGO_HELP(play);
+	unsigned flags = conf.detailed_help_given?
+		GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS;
+
+	ggo_print_help(&help, flags);
+	printf("supported audio formats: %s\n", AUDIO_FORMAT_HANDLERS);
 	exit(0);
 }
 
@@ -435,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)
@@ -978,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)