X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod_command.c;h=98dba3b32dfcaee1a7532d8e3021947102d98f89;hb=3d986bb96e80823bccb013b6d72abe22c4911d51;hp=5c7d2d53937df19706952ecce185246711be615a;hpb=cb193b91d68778125739fe129d49f3c5f4abf999;p=paraslash.git

diff --git a/audiod_command.c b/audiod_command.c
index 5c7d2d53..98dba3b3 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -216,46 +216,6 @@ __malloc static char *audiod_status_string(void)
 	return para_strdup(status);
 }
 
-static int get_play_time_slot_num(void)
-{
-	int i, oldest_slot = -1;
-	struct timeval oldest_wstime = {0, 0};
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		struct timeval wstime;
-		if (!s->wns || !s->wns[0].btrn)
-			continue;
-		btr_get_node_start(s->wns[0].btrn, &wstime);
-		if (oldest_slot >= 0 && tv_diff(&wstime, &oldest_wstime, NULL) > 0)
-			continue;
-		oldest_wstime = wstime;
-		oldest_slot = i;
-	}
-	//PARA_CRIT_LOG("oldest slot: %d\n", oldest_slot);
-	return oldest_slot;
-}
-
-__malloc static char *decoder_flags(void)
-{
-	int i;
-	char flags[MAX_STREAM_SLOTS + 1];
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		char flag = '0';
-		if (s->receiver_node)
-			flag += 1;
-		if (s->fns)
-			flag += 2;
-		if (s->wns)
-			flag += 4;
-		flags[i] = flag;
-	}
-	flags[MAX_STREAM_SLOTS] = '\0';
-	return para_strdup(flags);
-}
-
 static int dump_commands(int fd)
 {
 	char *buf = para_strdup(""), *tmp = NULL;
@@ -514,11 +474,10 @@ out:
  */
 void audiod_status_dump(bool force)
 {
-	int slot_num = get_play_time_slot_num();
 	char *old, *new;
 
 	old = stat_item_values[SI_PLAY_TIME];
-	new = get_time_string(slot_num);
+	new = get_time_string();
 	if (new) {
 		if (force || !old || strcmp(old, new)) {
 			free(old);
@@ -547,7 +506,7 @@ void audiod_status_dump(bool force)
 		free(new);
 
 	old = stat_item_values[SI_DECODER_FLAGS];
-	new = decoder_flags();
+	new = audiod_get_decoder_flags();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
 		stat_item_values[SI_DECODER_FLAGS] = new;