X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=66383ebe0b8cb6a742801cfd33cd08155ee857b1;hb=08471ab23c0abdf0ddd7ff836a15bd81fbce7520;hp=647367a396b2d96368931af790c45dd4f188b7c1;hpb=f787a626b8885247948e3c47ae886b1e3a7c2a3a;p=paraslash.git

diff --git a/play.c b/play.c
index 647367a3..66383ebe 100644
--- a/play.c
+++ b/play.c
@@ -50,7 +50,7 @@ static struct lls_parse_result *play_lpr;
  * Describes a request to change the state of para_play.
  *
  * There is only one variable of this type: \a rq of the global play task
- * structure. Command handlers only set this variable and the post_select()
+ * structure. Command handlers only set this variable and the post_monitor()
  * function of the play task investigates its value during each iteration of
  * the scheduler run and performs the actual work.
  */
@@ -109,10 +109,6 @@ typedef int (*play_cmd_handler_t)(struct lls_parse_result *lpr);
 struct play_command_info {
 	play_cmd_handler_t handler;
 };
-#define EXPORT_PLAY_CMD_HANDLER(_cmd) \
-	const struct play_command_info lsg_play_cmd_com_ ## _cmd ## _user_data = { \
-		.handler = com_ ## _cmd \
-	};
 
 static int loglevel = LL_WARNING;
 
@@ -121,7 +117,7 @@ INIT_STDERR_LOGGING(loglevel);
 
 char *stat_item_values[NUM_STAT_ITEMS] = {NULL};
 
-static struct sched sched = {.max_fileno = 0};
+static struct sched sched;
 static struct play_task play_task, *pt = &play_task;
 
 #define AFH_RECV_CMD (lls_cmd(LSG_RECV_CMD_CMD_AFH, recv_cmd_suite))
@@ -219,7 +215,6 @@ static long unsigned get_play_time(void)
 	return result;
 }
 
-
 static void wipe_receiver_node(void)
 {
 	PARA_NOTICE_LOG("cleaning up receiver node\n");
@@ -410,16 +405,16 @@ static int load_file(void)
 	pt->rn.task = task_register(
 		&(struct task_info) {
 			.name = lls_command_name(AFH_RECV_CMD),
-			.pre_select = AFH_RECV->pre_select,
-			.post_select = AFH_RECV->post_select,
+			.pre_monitor = AFH_RECV->pre_monitor,
+			.post_monitor = AFH_RECV->post_monitor,
 			.context = &pt->rn
 		}, &sched);
 	sprintf(buf, "%s decoder", af);
 	pt->fn.task = task_register(
 		&(struct task_info) {
 			.name = buf,
-			.pre_select = decoder->pre_select,
-			.post_select = decoder->post_select,
+			.pre_monitor = decoder->pre_monitor,
+			.post_monitor = decoder->post_monitor,
 			.context = &pt->fn
 		}, &sched);
 	register_writer_node(&pt->wn, pt->fn.btrn, &sched);
@@ -434,6 +429,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])
@@ -705,6 +709,11 @@ static void detach_stdout(void)
 	btr_remove_node(&pt->btrn);
 }
 
+#define EXPORT_PLAY_CMD_HANDLER(_cmd) \
+	const struct play_command_info lsg_play_cmd_com_ ## _cmd ## _user_data = { \
+		.handler = com_ ## _cmd \
+	};
+
 static int com_quit(__a_unused struct lls_parse_result *lpr)
 {
 	pt->rq = CRT_TERM_RQ;
@@ -845,6 +854,7 @@ static int com_pause(__a_unused struct lls_parse_result *lpr)
 	ss = PARA_MAX(ss, 0UL);
 	ss = PARA_MIN(ss, pt->num_chunks);
 	pt->start_chunk = ss;
+	pt->rq = CRT_REPOS;
 	kill_stream();
 	return 0;
 }
@@ -1043,9 +1053,16 @@ static void session_open(void)
 		history_file = para_strdup(OPT_STRING_VAL(HISTORY_FILE));
 	else {
 		char *home = para_homedir();
-		history_file = make_message("%s/.paraslash/play.history",
-			home);
+		char *dot_para = make_message("%s/.paraslash", home);
+
 		free(home);
+		ret = para_mkdir(dot_para, 0777);
+		/* warn, but otherwise ignore mkdir error */
+		if (ret < 0 && ret != -ERRNO_TO_PARA_ERROR(EEXIST))
+			PARA_WARNING_LOG("Can not create %s: %s\n", dot_para,
+				para_strerror(-ret));
+		history_file = make_message("%s/play.history", dot_para);
+		free(dot_para);
 	}
 	ici.history_file = history_file;
 	ici.loglevel = loglevel;
@@ -1058,7 +1075,7 @@ static void session_open(void)
 	sigemptyset(&act.sa_mask);
 	act.sa_flags = 0;
 	sigaction(SIGWINCH, &act, NULL);
-	sched.select_function = i9e_select;
+	sched.poll_function = i9e_poll;
 
 	ici.bound_keyseqs = get_mapped_keyseqs();
 	pt->btrn = ici.producer = btr_new_node(&(struct btr_node_description)
@@ -1086,22 +1103,22 @@ static void session_update_time_string(char *str, unsigned len)
 		if (btr_get_input_queue_size(pt->btrn) > 0)
 			return;
 	}
-	ie9_print_status_bar(str, len);
+	i9e_print_status_bar(str, len);
 }
 
 /*
  * If we are about to die we must call i9e_close() to reset the terminal.
  * However, i9e_close() must be called in *this* context, i.e. from
- * play_task.post_select() rather than from i9e_post_select(), because
+ * play_task.post_monitor() rather than from i9e_post_monitor(), because
  * otherwise i9e would access freed memory upon return. So the play task must
  * stay alive until the i9e task terminates.
  *
  * We achieve this by sending a fake SIGTERM signal via i9e_signal_dispatch()
- * and reschedule. In the next iteration, i9e->post_select returns an error and
+ * and reschedule. In the next iteration, i9e->post_monitor returns an error and
  * terminates. Subsequent calls to i9e_get_error() then return negative and we
  * are allowed to call i9e_close() and terminate as well.
  */
-static int session_post_select(__a_unused struct sched *s)
+static int session_post_monitor(__a_unused struct sched *s)
 {
 	int ret;
 
@@ -1124,11 +1141,11 @@ static int session_post_select(__a_unused struct sched *s)
 
 #else /* HAVE_READLINE */
 
-static int session_post_select(struct sched *s)
+static int session_post_monitor(struct sched *s)
 {
 	char c;
 
-	if (!FD_ISSET(STDIN_FILENO, &s->rfds))
+	if (!sched_read_ok(STDIN_FILENO, s))
 		return 0;
 	if (read(STDIN_FILENO, &c, 1))
 		do_nothing;
@@ -1147,11 +1164,11 @@ static void session_update_time_string(char *str, __a_unused unsigned len)
 }
 #endif /* HAVE_READLINE */
 
-static void play_pre_select(struct sched *s, __a_unused void *context)
+static void play_pre_monitor(struct sched *s, __a_unused void *context)
 {
 	char state;
 
-	para_fd_set(STDIN_FILENO, &s->rfds, &s->max_fileno);
+	sched_monitor_readfd(STDIN_FILENO, s);
 	state = get_playback_state();
 	if (state == 'R' || state == 'F' || state == 'X')
 		return sched_min_delay(s);
@@ -1185,7 +1202,7 @@ static unsigned get_time_string(char **result)
 	);
 }
 
-static int play_post_select(struct sched *s, __a_unused void *context)
+static int play_post_monitor(struct sched *s, __a_unused void *context)
 {
 	int ret;
 
@@ -1194,7 +1211,7 @@ static int play_post_select(struct sched *s, __a_unused void *context)
 		pt->rq = CRT_TERM_RQ;
 		return 0;
 	}
-	ret = session_post_select(s);
+	ret = session_post_monitor(s);
 	if (ret < 0)
 		goto out;
 	if (!pt->wn.btrn && !pt->fn.btrn) {
@@ -1238,23 +1255,18 @@ 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;
+	sched.default_timeout = 5000;
 	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",
-		.pre_select = play_pre_select,
-		.post_select = play_post_select,
+		.pre_monitor = play_pre_monitor,
+		.post_monitor = play_post_monitor,
 		.context = pt,
 	}, &sched);
 	ret = schedule(&sched);