X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=262f69ee4dc3d57686904fafb5597e1d955a189d;hb=be5daec66f163725489f42d512659a8af5c3fd59;hp=14fac42fd7b6e92566815d4c56b1f4b6b23c88e2;hpb=2bad70d84e763b4d866d7b97dbc1cdc8e030bd45;p=paraslash.git

diff --git a/play.c b/play.c
index 14fac42f..262f69ee 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.
  */
@@ -117,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))
@@ -192,6 +192,7 @@ static char get_playback_state(void)
 	assert(false);
 };
 
+/* returns number of milliseconds */
 static long unsigned get_play_time(void)
 {
 	char state = get_playback_state();
@@ -201,16 +202,16 @@ static long unsigned get_play_time(void)
 		return 0;
 	if (pt->num_chunks == 0 || pt->seconds == 0)
 		return 0;
-	/* where the stream started (in seconds) */
-	result = pt->start_chunk * pt->seconds / pt->num_chunks;
+	/* where the stream started (in milliseconds) */
+	result = 1000ULL * pt->start_chunk * pt->seconds / pt->num_chunks;
 	if (pt->wn.btrn) { /* Add the uptime of the writer node */
 		struct timeval diff = {.tv_sec = 0}, wstime;
 		btr_get_node_start(pt->wn.btrn, &wstime);
 		if (wstime.tv_sec > 0)
 			tv_diff(now, &wstime, &diff);
-		result += diff.tv_sec;
+		result += tv2ms(&diff);
 	}
-	result = PARA_MIN(result, pt->seconds);
+	result = PARA_MIN(result, pt->seconds * 1000);
 	result = PARA_MAX(result, 0UL);
 	return result;
 }
@@ -288,7 +289,7 @@ static int shuffle_compare(__a_unused const void *a, __a_unused const void *b)
 static void init_shuffle_map(void)
 {
 	unsigned n, num_inputs = lls_num_inputs(play_lpr);
-	shuffle_map = para_malloc(num_inputs * sizeof(unsigned));
+	shuffle_map = arr_alloc(num_inputs, sizeof(unsigned));
 	for (n = 0; n < num_inputs; n++)
 		shuffle_map[n] = n;
 	if (!OPT_GIVEN(RANDOMIZE))
@@ -405,16 +406,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);
@@ -591,7 +592,7 @@ static char *get_user_key_map_seq(int key)
 	if (!p)
 		return NULL;
 	len = p - kma;
-	result = para_malloc(len + 1);
+	result = alloc(len + 1);
 	memcpy(result, kma, len);
 	result[len] = '\0';
 	return result;
@@ -611,7 +612,7 @@ static char *get_key_map_seq_safe(int key)
 
 	if (len == 1 && isprint(*seq))
 		return seq;
-	sseq = para_malloc(2 + 2 * len + 1);
+	sseq = alloc(2 + 2 * len + 1);
 	sseq[0] = '0';
 	sseq[1] = 'x';
 	for (n = 0; n < len; n++) {
@@ -651,7 +652,7 @@ static char **get_mapped_keyseqs(void)
 	char **result;
 	int i;
 
-	result = para_malloc((NUM_MAPPED_KEYS + 1) * sizeof(char *));
+	result = arr_alloc(NUM_MAPPED_KEYS + 1, sizeof(char *));
 	FOR_EACH_MAPPED_KEY(i) {
 		char *seq = get_key_map_seq(i);
 		result[i] = seq;
@@ -840,20 +841,21 @@ EXPORT_PLAY_CMD_HANDLER(play);
 static int com_pause(__a_unused struct lls_parse_result *lpr)
 {
 	char state;
-	long unsigned seconds, ss;
+	uint64_t ms;
+	unsigned long cn; /* chunk num */
 
 	state = get_playback_state();
 	pt->playing = false;
 	if (state != 'P')
 		return 0;
-	seconds = get_play_time();
+	ms = get_play_time();
 	pt->playing = false;
-	ss = 0;
+	cn = 0;
 	if (pt->seconds > 0)
-		ss = seconds * pt->num_chunks / pt->seconds + 1;
-	ss = PARA_MAX(ss, 0UL);
-	ss = PARA_MIN(ss, pt->num_chunks);
-	pt->start_chunk = ss;
+		cn = ms * pt->num_chunks / pt->seconds / 1000 + 1;
+	cn = PARA_MIN(cn, pt->num_chunks);
+	pt->start_chunk = cn;
+	pt->rq = CRT_REPOS;
 	kill_stream();
 	return 0;
 }
@@ -952,7 +954,7 @@ static int com_ff(struct lls_parse_result *lpr)
 		return ret;
 	if (pt->playing && !pt->fn.btrn)
 		return 0;
-	seconds += get_play_time();
+	seconds += (get_play_time() + 500) / 1000;
 	seconds = PARA_MIN(seconds, (typeof(seconds))pt->seconds - 4);
 	seconds = PARA_MAX(seconds, 0);
 	pt->start_chunk = pt->num_chunks * seconds / pt->seconds;
@@ -1074,7 +1076,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)
@@ -1108,16 +1110,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 +1142,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 +1165,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);
@@ -1187,7 +1189,7 @@ static unsigned get_time_string(char **result)
 	length = pt->seconds;
 	if (length == 0)
 		return xasprintf(result, "0:00 [0:00] (0%%/0:00)");
-	seconds = get_play_time();
+	seconds = (get_play_time() + 500) / 1000;
 	return xasprintf(result, "#%u: %d:%02d [%d:%02d] (%d%%/%d:%02d) %s",
 		pt->current_file,
 		seconds / 60,
@@ -1201,7 +1203,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 +1212,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,18 +1256,18 @@ 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);
 	init_shuffle_map();
-	pt->invalid = para_calloc(sizeof(*pt->invalid) * num_inputs);
+	pt->invalid = arr_zalloc(num_inputs, sizeof(*pt->invalid));
 	pt->rq = CRT_FILE_CHANGE;
 	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);