/*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include "list.h"
#include "sched.h"
#include "ggo.h"
-#include "recv.h"
#include "buffer_tree.h"
+#include "recv.h"
#include "filter.h"
#include "grab_client.h"
#include "client.cmdline.h"
/** define the array containing all supported audio formats */
const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL};
+DEFINE_RECEIVER_ARRAY;
+
/** Defines how audiod handles one supported audio format. */
struct audio_format_info {
/** pointer to the receiver for this audio format */
PARA_NOTICE_LOG("closing %s receiver in slot %d\n",
audio_formats[s->format], slot_num);
a->receiver->close(s->receiver_node);
- btr_free_node(s->receiver_node->btrn);
+ btr_remove_node(&s->receiver_node->btrn);
free(s->receiver_node);
s->receiver_node = NULL;
tv_add(now, &(struct timeval)EMBRACE(0, 200 * 1000),
w = writers + wn->writer_num;
PARA_INFO_LOG("closing %s\n", writer_names[wn->writer_num]);
w->close(wn);
- btr_free_node(wn->btrn);
+ btr_remove_node(&wn->btrn);
}
static void close_writers(struct slot_info *s)
f = filters + fn->filter_num;
if (f->close)
f->close(fn);
- btr_free_node(fn->btrn);
+ btr_remove_node(&fn->btrn);
}
free(s->fns);
s->fns = NULL;
}
-/*
- * Whenever a task commits suicide by returning from post_select with t->error
- * < 0, it also removes its btr node. We do exactly that to kill a running
- * task. Note that the scheduler checks t->error also _before_ each pre/post
- * select call, so the victim will never be scheduled again.
- */
-static void kill_btrn(struct btr_node *btrn, struct task *t, int error)
-{
- if (t->error < 0)
- return;
- t->error = error;
- btr_remove_node(btrn);
-}
-
-static void kill_all_decoders(int error)
+static void notify_receivers(int error)
{
int i;
continue;
if (!s->receiver_node)
continue;
- kill_btrn(s->receiver_node->btrn, &s->receiver_node->task,
- error);
+ task_notify(&s->receiver_node->task, error);
}
}
EMBRACE(.name = r->name, .context = rn));
ret = r->open(rn);
if (ret < 0) {
- btr_free_node(rn->btrn);
+ btr_remove_node(&rn->btrn);
free(rn);
return ret;
}
}
/* Use default writer for audio formats which are not yet set up. */
FOR_EACH_AUDIO_FORMAT(i) {
- struct writer *w = writers + DEFAULT_WRITER;
+ void *writer_conf;
+ int writer_num;
a = afi + i;
if (a->num_writers > 0)
continue; /* already set up */
- PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
- writer_names[DEFAULT_WRITER]);
+ writer_conf = check_writer_arg_or_die(NULL, &writer_num);
a->writer_nums = para_malloc(sizeof(int));
- a->writer_nums[0] = DEFAULT_WRITER;
+ a->writer_nums[0] = writer_num;
a->writer_conf = para_malloc(sizeof(void *));
- a->writer_conf[0] = w->parse_config_or_die("");
+ a->writer_conf[0] = writer_conf;
a->num_writers = 1;
+ PARA_INFO_LOG("%s writer: %s (default)\n", audio_formats[i],
+ writer_names[writer_num]);
}
return 1;
}
try_to_close_slot(i);
if (audiod_status != AUDIOD_ON ||
!(stat_task->vss_status & VSS_STATUS_FLAG_PLAYING))
- return kill_all_decoders(-E_NOT_PLAYING);
+ return notify_receivers(E_NOT_PLAYING);
if (!must_start_decoder())
return;
ret = open_receiver(stat_task->current_audio_format_num);
if (!st->ct)
goto out;
if (st->ct->task.error >= 0) {
- kill_btrn(st->ct->btrn, &st->ct->task, -E_AUDIOD_OFF);
+ task_notify(&st->ct->task, E_AUDIOD_OFF);
goto out;
}
close_stat_pipe();
struct timeval diff;
tv_diff(now, &st->last_status_read, &diff);
if (diff.tv_sec > 61)
- kill_btrn(st->ct->btrn, &st->ct->task,
- -E_STATUS_TIMEOUT);
+ task_notify(&st->ct->task, E_AUDIOD_OFF);
goto out;
}
btr_merge(st->btrn, st->min_iqs);
sz = btr_next_buffer(st->btrn, &buf);
ret = for_each_stat_item(buf, sz, update_item);
if (ret < 0) {
- kill_btrn(st->ct->btrn, &st->ct->task, ret);
+ task_notify(&st->ct->task, E_AUDIOD_OFF);
goto out;
}
if (sz != ret) {