X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=83d28514fb15713b35fef165e130dd923d057613;hb=625fdbbafaf3842753bff02b349eaaf9554d846d;hp=cca203b5d393aa95dc50d0e7df1ffcceb0180420;hpb=c5e38315901ea63efd169af5d4ba3f3c66db7de9;p=paraslash.git

diff --git a/play.c b/play.c
index cca203b5..83d28514 100644
--- a/play.c
+++ b/play.c
@@ -7,7 +7,6 @@
 /** \file play.c Paraslash's standalone player. */
 
 #include <regex.h>
-#include <sys/time.h>
 #include <fnmatch.h>
 #include <signal.h>
 
@@ -177,8 +176,7 @@ 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);
+	play_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("play", conf);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
@@ -1196,7 +1194,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;
@@ -1204,7 +1202,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)
@@ -1234,7 +1232,7 @@ static void play_post_select(struct sched *s, struct task *t)
 	}
 	ret = 1;
 out:
-	t->error = ret;
+	return ret;
 }
 
 /**
@@ -1255,7 +1253,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);