X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=play.c;h=262f69ee4dc3d57686904fafb5597e1d955a189d;hb=539d39f36549c10656d8b31f3dea32702e9649df;hp=66383ebe0b8cb6a742801cfd33cd08155ee857b1;hpb=cdbc8067a2e27ee7f9e0d8ff11cf415603fc0558;p=paraslash.git

diff --git a/play.c b/play.c
index 66383ebe..262f69ee 100644
--- a/play.c
+++ b/play.c
@@ -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))
@@ -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,20 @@ 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;
@@ -953,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;
@@ -1188,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,
@@ -1260,7 +1261,7 @@ int main(int argc, char *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){