X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=790c0102c896d6a49d90c4f84d7db8ed6404abad;hp=d5c53bf90059101cd345254e0a3c294c3df73307;hb=5ab451760281b344bfa6e495ab1aea7d80323c3c;hpb=4d9d588c5df359c3c5f279fbfd4ea51d3a2afc87

diff --git a/audiod_command.c b/audiod_command.c
index d5c53bf9..790c0102 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -30,7 +30,7 @@
 #include "write.h"
 #include "fd.h"
 #include "version.h"
-#include "audiod_command_list.h"
+#include "audiod.command_list.h"
 
 extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
@@ -216,26 +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;
@@ -376,10 +356,10 @@ static int com_grab(int fd, int argc, char **argv)
 	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
-	clean_exit(EXIT_SUCCESS, "terminating on user request");
+	return -E_AUDIOD_TERM;
 }
 
 static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
@@ -513,11 +493,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);