X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=6eed58ab53779dd22afb9442d002b60c71165525;hp=814ec16a5288cd7ba4be5c0bbea275a9fc812ef6;hb=b3644a3f5de245609dc608a947ed71e2f75b2fd5;hpb=b01605d7062e4d1f005d5aaaaed158d8efe06d79

diff --git a/play.c b/play.c
index 814ec16a..6eed58ab 100644
--- a/play.c
+++ b/play.c
@@ -137,30 +137,14 @@ static void check_afh_receiver_or_die(void)
 	exit(EXIT_FAILURE);
 }
 
-/** Description to be included in the --detailed-help output. */
-#define PP_DESC \
-"para_play is a command line audio player.\n" \
-"\n" \
-"It operates either in command mode or in insert mode. In insert mode it\n" \
-"presents a prompt and allows to enter para_play commands like stop, play, pause\n" \
-"etc. In command mode, the current audio file is shown and the program reads\n" \
-"single key strokes from stdin. Keys may be mapped to para_play commands.\n" \
-"Whenever a mapped key is pressed, the associated command is executed.\n" \
-
 __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", PLAY_CMDLINE_PARSER_PACKAGE "-"
-//		PLAY_CMDLINE_PARSER_VERSION);
-
-	printf_or_die("%s\n\n", play_args_info_usage);
-	if (d)
-		printf_or_die("%s\n", PP_DESC);
-	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);
 }
 
@@ -177,8 +161,8 @@ static void parse_config_or_die(int argc, char *argv[])
 	};
 
 	play_cmdline_parser_ext(argc, argv, &conf, &params);
-	HANDLE_VERSION_FLAG("play", conf);
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
+	version_handle_flag("play", conf.version_given);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
 	if (conf.config_file_given)
@@ -990,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)
@@ -1044,7 +1020,7 @@ static void session_open(__a_unused struct play_task *pt)
 	char *history_file;
 	struct sigaction act;
 
-	PARA_NOTICE_LOG("\n%s\n", VERSION_TEXT("play"));
+	PARA_NOTICE_LOG("\n%s\n", version_text("play"));
 	if (conf.history_file_given)
 		history_file = para_strdup(conf.history_file_arg);
 	else {