X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=2346c6b0101045d51e87b5d40abb5b983df6f014;hp=233da70099b6cdc2bf441bb1bc9cce44fc8da701;hb=62c0894fbb589dd45e69b7d9ef1fd152a9960d62;hpb=ebbea4043aa7c7f200e4f56c3bfa42f5c31f2e03

diff --git a/play.c b/play.c
index 233da700..2346c6b0 100644
--- a/play.c
+++ b/play.c
@@ -151,73 +151,38 @@ static void handle_help_flags(void)
 
 static void parse_config_or_die(int argc, char *argv[])
 {
-	const struct lls_command *cmd = CMD_PTR;
-	int i, ret, cf_argc;
-	char *cf, *errctx, **cf_argv;
-	struct lls_parse_result *cf_lpr, *merged_lpr;
+	int i, ret;
 	unsigned num_kmas;
-	void *map;
-	size_t sz;
+	char *errctx;
 
-	ret = lls(lls_parse(argc, argv, cmd, &play_lpr, &errctx));
-	if (ret < 0)
-		goto fail;
+	ret = lls(lls_parse(argc, argv, CMD_PTR, &play_lpr, &errctx));
+	if (ret < 0) {
+		if (errctx)
+			PARA_EMERG_LOG("%s\n", errctx);
+		free(errctx);
+		PARA_EMERG_LOG("failed to parse command line options: %s\n",
+			para_strerror(-ret));
+		exit(EXIT_FAILURE);
+	}
 	loglevel = OPT_UINT32_VAL(LOGLEVEL);
 	version_handle_flag("play", OPT_GIVEN(VERSION));
 	handle_help_flags(); /* also handles the zero-arg case */
-	if (OPT_GIVEN(CONFIG_FILE))
-		cf = para_strdup(OPT_STRING_VAL(CONFIG_FILE));
-	else {
-		char *home = para_homedir();
-		cf = make_message("%s/.paraslash/play.conf", home);
-		free(home);
-	}
-	ret = mmap_full_file(cf, O_RDONLY, &map, &sz, NULL);
+	ret = lsu_merge_config_file_options(OPT_STRING_VAL(CONFIG_FILE),
+		"play.conf", &play_lpr, CMD_PTR, play_suite, 0 /* flags */);
 	if (ret < 0) {
-		if (ret != -E_EMPTY && ret != -ERRNO_TO_PARA_ERROR(ENOENT))
-			goto free_cf;
-		if (ret == -ERRNO_TO_PARA_ERROR(ENOENT) && OPT_GIVEN(CONFIG_FILE))
-			goto free_cf;
-		ret = 0;
-		goto setup_keymap;
+		PARA_EMERG_LOG("failed to parse config file: %s\n",
+			para_strerror(-ret));
+		exit(EXIT_FAILURE);
 	}
-	ret = lls(lls_convert_config(map, sz, NULL, &cf_argv, &errctx));
-	para_munmap(map, sz);
-	if (ret < 0)
-		goto free_cf;
-	cf_argc = ret;
-	ret = lls(lls_parse(cf_argc, cf_argv, cmd, &cf_lpr, &errctx));
-	lls_free_argv(cf_argv);
-	if (ret < 0)
-		goto free_cf;
-	ret = lls(lls_merge(play_lpr, cf_lpr, cmd, &merged_lpr, &errctx));
-	lls_free_parse_result(cf_lpr, cmd);
-	if (ret < 0)
-		goto free_cf;
-	lls_free_parse_result(play_lpr, cmd);
-	play_lpr = merged_lpr;
 	loglevel = OPT_UINT32_VAL(LOGLEVEL);
-setup_keymap:
 	num_kmas = OPT_GIVEN(KEY_MAP);
 	for (i = 0; i < num_kmas; i++) {
 		const char *kma = lls_string_val(i, OPT_RESULT(KEY_MAP));
 		if (*kma && strchr(kma + 1, ':'))
 			continue;
 		PARA_EMERG_LOG("invalid key map arg: %s\n", kma);
-		goto free_cf;
+		exit(EXIT_FAILURE);
 	}
-	ret = 1;
-free_cf:
-	free(cf);
-	if (ret >= 0)
-		return;
-	lls_free_parse_result(play_lpr, cmd);
-fail:
-	if (errctx)
-		PARA_EMERG_LOG("%s\n", errctx);
-	free(errctx);
-	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-	exit(EXIT_FAILURE);
 }
 
 static char get_playback_state(void)
@@ -254,7 +219,6 @@ static long unsigned get_play_time(void)
 	return result;
 }
 
-
 static void wipe_receiver_node(void)
 {
 	PARA_NOTICE_LOG("cleaning up receiver node\n");
@@ -469,6 +433,15 @@ static int next_valid_file(void)
 	int i, j = pt->current_file;
 	unsigned num_inputs = lls_num_inputs(play_lpr);
 
+	if (j == num_inputs - 1) {
+		switch (OPT_UINT32_VAL(END_OF_PLAYLIST)) {
+		case EOP_LOOP: break;
+		case EOP_STOP:
+			pt->playing = false;
+			return 0;
+		case EOP_QUIT: return -E_EOP;
+		}
+	}
 	for (i = 0; i < num_inputs; i++) {
 		j = (j + 1) % num_inputs;
 		if (!pt->invalid[j])
@@ -1273,18 +1246,13 @@ int main(int argc, char *argv[])
 	int ret;
 	unsigned num_inputs;
 
-	/* needed this early to make help work */
-	recv_init();
-
 	sched.default_timeout.tv_sec = 5;
 	parse_config_or_die(argc, argv);
-	AFH_RECV->init();
 	session_open();
 	num_inputs = lls_num_inputs(play_lpr);
 	init_shuffle_map();
 	pt->invalid = para_calloc(sizeof(*pt->invalid) * num_inputs);
 	pt->rq = CRT_FILE_CHANGE;
-	pt->current_file = num_inputs - 1;
 	pt->playing = true;
 	pt->task = task_register(&(struct task_info){
 		.name = "play",