X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=feb0f9976547a342e032120d901f1563afc86079;hb=bb899fb1a0c279a2890ff30d11bf7aec50fb92ed;hp=14fac42fd7b6e92566815d4c56b1f4b6b23c88e2;hpb=8181748ed84ac1e7d48ede7c00c9559263683791;p=paraslash.git diff --git a/play.c b/play.c index 14fac42f..feb0f997 100644 --- a/play.c +++ b/play.c @@ -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; } @@ -1144,7 +1145,7 @@ static int session_post_select(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; @@ -1167,7 +1168,7 @@ static void play_pre_select(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); @@ -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);