X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=35b76b5f6fa277ea2aa55656f557b32ef36b5585;hp=0f7aa7e625ffcd0c7274f16e184f308b0322ceab;hb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979;hpb=4e226ad64a48792355710e4e45e76c694914ae74

diff --git a/audiod_command.c b/audiod_command.c
index 0f7aa7e6..35b76b5f 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,14 +1,13 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file audiod_command.c commands for para_audiod */
+/** \file audiod_command.c Commands for para_audiod. */
 
 #include <regex.h>
 #include <sys/types.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "audiod.cmdline.h"
@@ -27,8 +26,12 @@
 #include "fd.h"
 #include "audiod_command_list.h"
 
+extern struct sched sched;
 extern char *stat_item_values[NUM_STAT_ITEMS];
 
+
+struct audiod_command audiod_cmds[] = {DEFINE_AUDIOD_CMD_ARRAY};
+
 /** Iterate over the array of all audiod commands. */
 #define FOR_EACH_COMMAND(c) for (c = 0; audiod_cmds[c].name; c++)
 
@@ -194,7 +197,7 @@ static int get_play_time_slot_num(void)
 	FOR_EACH_SLOT(i) {
 		struct slot_info *s = &slot[i];
 		struct timeval wstime;
-		if (!s->wns)
+		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)
@@ -249,7 +252,7 @@ static int dump_commands(int fd)
  * to each individual command to close the fd if necessary.
  */
 
-int com_help(int fd, int argc, char **argv)
+static int com_help(int fd, int argc, char **argv)
 {
 	int i, ret;
 	char *buf;
@@ -284,9 +287,9 @@ out:
 	return ret;
 }
 
-int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 {
-	char *tl = get_task_list();
+	char *tl = get_task_list(&sched);
 	int ret = 1;
 	if (tl)
 		ret = client_write(fd, tl);
@@ -296,7 +299,7 @@ int com_tasks(int fd, __a_unused int argc, __a_unused char **argv)
 	return ret;
 }
 
-int com_stat(int fd, int argc, char **argv)
+static int com_stat(int fd, int argc, char **argv)
 {
 	int i, ret, parser_friendly = 0;
 	uint64_t mask = 0;
@@ -342,39 +345,39 @@ int com_stat(int fd, int argc, char **argv)
 	return ret;
 }
 
-int com_grab(int fd, int argc, char **argv)
+static int com_grab(int fd, int argc, char **argv)
 {
-	return grab_client_new(fd, argc, argv);
+	return grab_client_new(fd, argc, argv, &sched);
 }
 
-__noreturn int com_term(int fd, __a_unused int argc, __a_unused char **argv)
+__noreturn static int com_term(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	close(fd);
 	clean_exit(EXIT_SUCCESS, "terminating on user request");
 }
 
-int com_on(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_on(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_ON;
 	close(fd);
 	return 1;
 }
 
-int com_off(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_off(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_OFF;
 	close(fd);
 	return 1;
 }
 
-int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
+static int com_sb(int fd, __a_unused int argc, __a_unused char **argv)
 {
 	audiod_status = AUDIOD_STANDBY;
 	close(fd);
 	return 1;
 }
 
-int com_cycle(int fd, int argc, char **argv)
+static int com_cycle(int fd, int argc, char **argv)
 {
 	switch (audiod_status) {
 		case  AUDIOD_ON:
@@ -480,7 +483,7 @@ void audiod_status_dump(void)
 			free(new);
 	}
 
-	new = uptime_str();
+	new = get_server_uptime_str(now);
 	old = stat_item_values[SI_AUDIOD_UPTIME];
 	if (!old || strcmp(old, new)) {
 		free(old);