X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=48da675ccc037f11bf9b044f232a1ecc83cc390e;hb=e3a7e12639c34fd86d48a072beb48add8c498d09;hp=14fac42fd7b6e92566815d4c56b1f4b6b23c88e2;hpb=6a8bd08b529569d32fab92d307b4f7410ae3462c;p=paraslash.git

diff --git a/play.c b/play.c
index 14fac42f..48da675c 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.
  */
@@ -405,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);
@@ -854,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;
 }
@@ -1108,16 +1109,16 @@ static void session_update_time_string(char *str, unsigned 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;
 
@@ -1140,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;
@@ -1163,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);
@@ -1201,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;
 
@@ -1210,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) {
@@ -1254,7 +1255,7 @@ int main(int argc, char *argv[])
 	int ret;
 	unsigned num_inputs;
 
-	sched.default_timeout.tv_sec = 5;
+	sched.default_timeout = 5000;
 	parse_config_or_die(argc, argv);
 	session_open();
 	num_inputs = lls_num_inputs(play_lpr);
@@ -1264,8 +1265,8 @@ int main(int argc, char *argv[])
 	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);