void **filter_conf;
/** the number of filters that should be activated for this audio format */
unsigned int num_writers;
- /** pointer to the array of writers to be activated */
- struct writer **writers;
+ /** Array of writer numbers to be activated. */
+ int *writer_nums;
/** pointer to the array of writer configurations */
void **writer_conf;
/** do not start receiver/filters/writer before this time */
return -E_UNSUPPORTED_AUDIO_FORMAT;
}
-char *get_time_string(struct timeval *newest_stime)
+char *get_time_string(int slot_num)
{
- struct timeval diff, adj_stream_start, tmp;
- int total = 0, use_server_time = 1,
- length_seconds = stat_task->length_seconds;
+ int ret, seconds = 0, length;
+ struct timeval *tmp, sum, sss, /* server stream start */
+ wtime, /* now - writer start */
+ rskip; /* receiver start - sss */
+ struct slot_info *s = slot_num < 0? NULL : &slot[slot_num];
+ if (audiod_status == AUDIOD_OFF)
+ goto empty;
if (!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING)) {
- if (length_seconds)
+ if (stat_task->length_seconds) /* paused */
return NULL;
- return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
+ goto empty; /* stopped */
+ }
+ if (audiod_status == AUDIOD_ON && !s)
+ goto empty;
+ /* valid status items and playing */
+ if (s) { /* writer active in this slot */
+ length = s->seconds_total;
+ tmp = &s->server_stream_start;
+ } else { /* standby mode, rely on status items */
+ length = stat_task->length_seconds;
+ tmp = &stat_task->server_stream_start;
}
- if (audiod_status == AUDIOD_OFF)
- goto out;
if (stat_task->sa_time_diff_sign > 0)
- tv_diff(&stat_task->server_stream_start, &stat_task->sa_time_diff,
- &adj_stream_start);
+ tv_diff(tmp, &stat_task->sa_time_diff, &sss);
else
- tv_add(&stat_task->server_stream_start, &stat_task->sa_time_diff,
- &adj_stream_start);
- tmp = adj_stream_start;
- if (newest_stime && audiod_status == AUDIOD_ON) {
- tv_diff(newest_stime, &adj_stream_start, &diff);
- if (tv2ms(&diff) < 5000) {
- tmp = *newest_stime;
- use_server_time = 0;
- }
+ tv_add(tmp, &stat_task->sa_time_diff, &sss);
+ if (!s) {
+ struct timeval diff;
+ tv_diff(now, &sss, &diff);
+ seconds = diff.tv_sec + stat_task->offset_seconds;
+ goto out;
}
- tv_diff(now, &tmp, &diff);
- total = diff.tv_sec + stat_task->offset_seconds;
- if (total > length_seconds)
- total = length_seconds;
- if (total < 0)
- total = 0;
+ tv_diff(now, &s->wstime, &wtime);
+ seconds = s->offset_seconds;
+ ret = tv_diff(&s->rstime, &sss, &rskip);
+ if (ret > 0) { /* audiod was started in the middle of the stream */
+ tv_add(&wtime, &rskip, &sum);
+ seconds += sum.tv_sec;
+ } else
+ seconds += wtime.tv_sec;
out:
+ seconds = PARA_MIN(seconds, length);
+ seconds = PARA_MAX(seconds, 0);
return make_message(
"%s: %s%d:%02d [%d:%02d] (%d%%/%d:%02d)\n",
status_item_list[SI_PLAY_TIME],
- use_server_time? "~" : "",
- total / 60,
- total % 60,
- (length_seconds - total) / 60,
- (length_seconds - total) % 60,
- length_seconds? (total * 100 + length_seconds / 2) /
- length_seconds : 0,
- length_seconds / 60,
- length_seconds % 60
+ s? "" : "~",
+ seconds / 60,
+ seconds % 60,
+ (length - seconds) / 60,
+ (length - seconds) % 60,
+ length? (seconds * 100 + length / 2) / length : 0,
+ length / 60,
+ length % 60
);
+empty:
+ return make_message("%s:\n", status_item_list[SI_PLAY_TIME]);
}
static int want_colors(void)
para_install_sighandler(SIGINT);
para_install_sighandler(SIGTERM);
para_install_sighandler(SIGHUP);
- signal(SIGPIPE, SIG_IGN);
+ para_sigaction(SIGPIPE, SIG_IGN);
}
static void clear_slot(int slot_num)
PARA_INFO_LOG("opening %s filters\n", audio_formats[s->format]);
s->fc = para_calloc(sizeof(struct filter_chain));
s->fc->filter_nodes = para_malloc(nf * sizeof(struct filter_node));
- s->fc->inbuf = s->receiver_node->buf;
+ s->fc->inbufp = &s->receiver_node->buf;
s->fc->in_loaded = &s->receiver_node->loaded;
s->fc->input_error = &s->receiver_node->task.error;
- s->fc->task.pre_select = filter_pre_select;
- s->fc->task.post_select = NULL;
+ s->fc->task.pre_select = NULL;
+ s->fc->task.post_select = filter_post_select;
s->fc->task.error = 0;
s->fc->num_filters = nf;
f->open(fn);
PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
audio_formats[s->format], i, nf, f->name, slot_num);
- s->fc->outbuf = fn->buf;
+ s->fc->outbufp = &fn->buf;
s->fc->out_loaded = &fn->loaded;
}
register_task(&s->fc->task);
else
s->wng = wng_new(a->num_writers);
if (s->fc) {
- s->wng->buf = s->fc->outbuf;
+ s->wng->bufp = s->fc->outbufp;
s->wng->loaded = s->fc->out_loaded;
s->wng->input_error = &s->fc->task.error;
s->wng->channels = &s->fc->channels;
s->fc->output_error = &s->wng->task.error;
PARA_INFO_LOG("samplerate: %d\n", *s->wng->samplerate);
} else {
- s->wng->buf = s->receiver_node->buf;
+ s->wng->bufp = &s->receiver_node->buf;
s->wng->loaded = &s->receiver_node->loaded;
s->wng->input_error = &s->receiver_node->task.error;
}
for (i = 0; i < a->num_writers; i++) {
s->wng->writer_nodes[i].conf = a->writer_conf[i];
- s->wng->writer_nodes[i].writer = a->writers[i];
+ s->wng->writer_nodes[i].writer_num = a->writer_nums[i];
}
ret = wng_open(s->wng);
- if (ret < 0) {
- PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ if (ret < 0)
return;
- }
s->wstime = *now;
+ s->server_stream_start = stat_task->server_stream_start.tv_sec?
+ stat_task->server_stream_start : *now;
+ s->offset_seconds = stat_task->offset_seconds;
+ s->seconds_total = stat_task->length_seconds;
activate_inactive_grab_clients(slot_num, s->format, s->fc);
}
audio_formats[s->format], a->receiver->name, slot_num);
rn->task.pre_select = a->receiver->pre_select;
rn->task.post_select = a->receiver->post_select;
+ s->rstime = *now;
sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
register_task(&rn->task);
ret = 1;
FOR_EACH_AUDIO_FORMAT(i) {
a = &afi[i];
a->writer_conf = para_malloc(nw * sizeof(void *));
- a->writers = para_malloc(nw * sizeof(struct writer *));
+ a->writer_nums = para_malloc(nw * sizeof(int));
a->num_writers = 0;
}
for (i = 0; i < conf.writer_given; i++) {
ret = writer_num;
goto out;
}
- a->writers[nw] = &writers[writer_num];
+ a->writer_nums[nw] = writer_num;
a->writer_conf[nw] = wconf;
PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret],
nw, writer_names[writer_num]);