/*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "string.h"
#include "write.h"
#include "fd.h"
-#include "audiod_command_list.h"
+#include "version.h"
+#include "audiod.command_list.h"
extern struct sched sched;
extern char *stat_item_values[NUM_STAT_ITEMS];
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;
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)
return 1;
}
+static int com_version(int fd, int argc, char **argv)
+{
+ int ret;
+ char *msg;
+
+ if (argc > 1 && strcmp(argv[1], "-v") == 0)
+ msg = make_message("%s", version_text("audiod"));
+ else
+ msg = make_message("%s\n", version_single_line("audiod"));
+ ret = client_write(fd, msg);
+ free(msg);
+ if (ret >= 0)
+ close(fd);
+ return ret;
+}
+
static int check_perms(uid_t uid)
{
int i;
*/
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);
free(new);
}
- new = get_server_uptime_str(now);
+ new = daemon_get_uptime_str(now);
old = stat_item_values[SI_AUDIOD_UPTIME];
if (force || !old || strcmp(old, new)) {
free(old);