/** \file audiod.c the paraslash's audio daemon */
-#include <sys/time.h> /* gettimeofday */
#include "para.h"
#include "audiod.cmdline.h"
static char *stat_item_values[NUM_STAT_ITEMS];
static FILE *logfile;
static const struct timeval restart_delay = {0, 300 * 1000};
-
static struct audio_format_info afi[NUM_AUDIO_FORMATS];
+static struct timeval *now;
static struct signal_task signal_task_struct, *sig_task = &signal_task_struct;
static char *get_time_string(struct timeval *newest_stime)
{
- struct timeval now, diff, adj_stream_start, tmp;
+ struct timeval diff, adj_stream_start, tmp;
int total = 0, use_server_time = 1;
if (!playing) {
use_server_time = 0;
}
}
- gettimeofday(&now, NULL);
- tv_diff(&now, &tmp, &diff);
+ tv_diff(now, &tmp, &diff);
total = diff.tv_sec + offset_seconds;
if (total > length_seconds)
total = length_seconds;
s->format = -1;
}
-static void set_restart_barrier(int format, struct timeval *now)
-{
- struct timeval tmp;
-
- if (now)
- tmp = *now;
- else
- gettimeofday(&tmp, NULL);
- tv_add(&tmp, &restart_delay, &afi[format].restart_barrier);
-}
-
static void close_receiver(int slot_num)
{
struct slot_info *s = &slot[slot_num];
a->receiver->close(s->receiver_node);
free(s->receiver_node);
s->receiver_node = NULL;
- set_restart_barrier(s->format, NULL);
+ /* set restart barrier */
+ tv_add(now, &restart_delay, &afi[s->format].restart_barrier);
}
static void kill_all_decoders(void)
}
}
-static void check_sigchld(void)
-{
- pid_t pid;
- struct timeval now;
- gettimeofday(&now, NULL);
-
-reap_next_child:
- pid = para_reap_child();
- if (pid <= 0)
- return;
- PARA_CRIT_LOG("para_client died (pid %d)\n", pid);
- goto reap_next_child;
-}
-
static int get_empty_slot(void)
{
int i;
clear_slot(i);
return i;
}
- if (s->wng)
- continue;
- if (s->receiver_node)
- continue;
- if (s->fc)
+ if (s->wng || s->receiver_node || s->fc)
continue;
clear_slot(i);
return i;
offset_seconds = 0;
audiod_status_dump();
playing = 0;
- stat_item_values[SI_STATUS_BAR] = make_message("%s:no connection to para_server\n",
+ stat_item_values[SI_STATUS_BAR] = make_message(
+ "%s:no connection to para_server\n",
status_item_list[SI_STATUS_BAR]);
stat_client_write(stat_item_values[SI_STATUS_BAR], SI_STATUS_BAR);
}
exit(status);
}
-/** get the number of filters for the given audio format */
+/**
+ * get the number of filters
+ *
+ * \param audio_format_num the number identifying the audio format
+ *
+ * \return the number of filters for the given audio format
+ *
+ * \sa struct filter;
+ */
int num_filters(int audio_format_num)
{
return afi[audio_format_num].num_filters;
}
-void filter_event_handler(struct task *t)
+static void filter_event_handler(struct task *t)
{
PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
unregister_task(t);
}
}
-static void open_writer(int slot_num, struct timeval *now)
+static void open_writer(int slot_num)
{
int ret, i;
struct slot_info *s = &slot[slot_num];
activate_inactive_grab_clients(slot_num, s->format, &s->fc->filters);
}
-void rn_event_handler(struct task *t)
+static void rn_event_handler(struct task *t)
{
// struct receiver_node *rn = t->private_data;
PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
unregister_task(t);
}
+
static void open_receiver(int format)
{
struct audio_format_info *a = &afi[format];
clean_exit(EXIT_FAILURE, PARA_STRERROR(-slot_num));
s = &slot[slot_num];
s->format = format;
- gettimeofday(&s->rtime, NULL);
+ s->rtime = *now;
s->wtime = s->rtime;
s->receiver_node = para_calloc(sizeof(struct receiver_node));
rn = s->receiver_node;
register_task(&rn->task);
}
-static int is_frozen(int format, struct timeval *now)
+static int is_frozen(int format)
{
struct audio_format_info *a = &afi[format];
return (tv_diff(now, &a->restart_barrier, NULL) > 0)? 0 : 1;
}
-static void open_current_receiver(struct timeval *now)
+static void open_current_receiver(void)
{
int i;
i = get_audio_format_num(af_status);
if (i < 0)
return;
- if ((decoder_running(i) & 1) || is_frozen(i, now))
+ if (decoder_running(i) || is_frozen(i))
return;
open_receiver(i);
}
static void compute_time_diff(const struct timeval *status_time)
{
- struct timeval now, tmp, diff;
+ struct timeval tmp, diff;
static int count;
int sign;
const struct timeval max_deviation = {0, 500 * 1000};
const int time_smooth = 5;
- gettimeofday(&now, NULL);
- sign = tv_diff(status_time, &now, &diff);
+ sign = tv_diff(status_time, now, &diff);
// PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__,
// sign, sa_time_diff_sign);
if (!count) {
{
switch (sig) {
case SIGCHLD:
- return check_sigchld();
+ for (;;) {
+ pid_t pid = para_reap_child();
+ if (pid <= 0)
+ return;
+ PARA_CRIT_LOG("para_client died (pid %d)\n", pid);
+ }
case SIGINT:
case SIGTERM:
case SIGHUP:
static void check_timeouts(void)
{
- struct timeval now;
+
int slot_num, timeout = conf.stream_timeout_arg;
- gettimeofday(&now, NULL);
FOR_EACH_SLOT(slot_num) {
struct slot_info *s = &slot[slot_num];
if (s->format < 0)
continue;
/* check read time */
if (s->receiver_node &&
- now.tv_sec > s->rtime.tv_sec + timeout) {
+ now->tv_sec > s->rtime.tv_sec + timeout) {
PARA_INFO_LOG("%s stream (slot %d) not ready\n",
audio_formats[s->format], slot_num);
s->receiver_node->eof = 1;
{
int i;
+ now = &s->now;
if (audiod_status != AUDIOD_ON)
kill_all_decoders();
else if (playing)
- open_current_receiver(&s->now);
+ open_current_receiver();
check_timeouts();
FOR_EACH_SLOT(i) {
struct receiver_node *rn;
rn = slot[i].receiver_node;
if (rn && rn->loaded && !slot[i].wng) {
open_filters(i);
- open_writer(i, &s->now);
+ open_writer(i);
}
}
}
{
int i;
+ now = &s->now;
FOR_EACH_SLOT(i) {
struct receiver_node *rn = slot[i].receiver_node;
if (rn && rn->loaded)
- slot[i].rtime = s->now;
+ slot[i].rtime = *now;
}
}
free(cmd);
return ret;
}
+
static int init_filters(void)
{
int i, ret, nf;
PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
}
-void init_command_task(struct command_task *ct)
+static void init_command_task(struct command_task *ct)
{
ct->task.pre_select = command_pre_select;
ct->task.post_select = command_post_select;
projects / paraslash.git / blobdiff