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

diff --git a/play.c b/play.c
index 7537ddd6..6eed58ab 100644
--- a/play.c
+++ b/play.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file play.c Paraslash's standalone player. */
 
 #include <regex.h>
-#include <sys/time.h>
 #include <fnmatch.h>
 #include <signal.h>
 
@@ -138,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,12 +160,11 @@ static void parse_config_or_die(int argc, char *argv[])
 		.print_errors = 1
 	};
 
-	if (play_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
-	HANDLE_VERSION_FLAG("play", conf);
+	play_cmdline_parser_ext(argc, argv, &conf, &params);
+	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();
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (conf.config_file_given)
 		config_file = para_strdup(conf.config_file_arg);
 	else {
@@ -199,6 +181,7 @@ static void parse_config_or_die(int argc, char *argv[])
 		params.initialize = 0;
 		params.check_required = 1;
 		play_cmdline_parser_config_file(config_file, &conf, &params);
+		loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	}
 	for (i = 0; i < conf.key_map_given; i++) {
 		char *s = strchr(conf.key_map_arg[i] + 1, ':');
@@ -427,9 +410,7 @@ static int load_file(struct play_task *pt)
 	register_writer_node(&pt->wn, pt->fn.btrn, &sched);
 	return 1;
 fail:
-	afh_recv->close(&pt->rn);
-	btr_remove_node(&pt->rn.btrn);
-	afh_recv->free_config(pt->rn.conf);
+	wipe_receiver_node(pt);
 	return ret;
 }
 
@@ -993,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)
@@ -1047,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 {
@@ -1198,7 +1171,7 @@ static unsigned get_time_string(struct play_task *pt, char **result)
 	);
 }
 
-static void play_post_select(struct sched *s, struct task *t)
+static int play_post_select(struct sched *s, struct task *t)
 {
 	struct play_task *pt = container_of(t, struct play_task, task);
 	int ret;
@@ -1206,7 +1179,7 @@ static void play_post_select(struct sched *s, struct task *t)
 	ret = eof_cleanup(pt);
 	if (ret < 0) {
 		pt->rq = CRT_TERM_RQ;
-		return;
+		return 0;
 	}
 	ret = session_post_select(s, t);
 	if (ret < 0)
@@ -1236,7 +1209,7 @@ static void play_post_select(struct sched *s, struct task *t)
 	}
 	ret = 1;
 out:
-	t->error = ret;
+	return ret;
 }
 
 /**
@@ -1257,7 +1230,7 @@ int main(int argc, char *argv[])
 	filter_init();
 	writer_init();
 
-	gettimeofday(now, NULL);
+	clock_get_realtime(now);
 	sched.default_timeout.tv_sec = 5;
 
 	parse_config_or_die(argc, argv);