/** \file audiod.c the paraslash's audio daemon */
#include <sys/types.h>
#include <dirent.h>
+#include <signal.h>
#include "para.h"
#include "error.h"
INIT_LIST_HEAD(&fn->callbacks);
f->open(fn);
PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
- audio_formats[s->format], i + 1, nf, f->name, slot_num);
+ audio_formats[s->format], i, nf, f->name, slot_num);
s->fc->outbuf = fn->buf;
s->fc->out_loaded = &fn->loaded;
}
activate_inactive_grab_clients(slot_num, s->format, s->fc);
}
-#if 0
-static void rn_event_handler(struct task *t)
-{
- struct receiver_node *rn = t->private_data;
- int i;
-
- PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
- unregister_task(t);
- rn->error = t->ret;
- /* set restart barrier */
- FOR_EACH_SLOT(i) {
- struct timeval restart_delay = {0, 10 * 1000};
- if (slot[i].receiver_node != rn)
- continue;
- if (rn->error != -E_RECV_EOF)
- /* don't reconnect immediately on errors */
- restart_delay.tv_sec = 5;
- tv_add(now, &restart_delay, &afi[slot[i].format].restart_barrier);
- }
-}
-#endif
-
static int open_receiver(int format)
{
struct audio_format_info *a = &afi[format];
struct slot_info *s;
int ret, slot_num;
struct receiver_node *rn;
- const struct timeval restart_delay = {1, 0};
+ const struct timeval restart_delay = {2, 0};
ret = get_empty_slot();
if (ret < 0)
rn->task.post_select = a->receiver->post_select;
sprintf(rn->task.status, "%s receiver node", rn->receiver->name);
register_task(&rn->task);
- return 1;
+ ret = 1;
err:
- PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ if (ret < 0)
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
tv_add(now, &restart_delay, &afi[format].restart_barrier);
return ret;
}
return filter_num;
a->filter_nums[nf] = filter_num;
a->num_filters++;
- PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf + 1,
+ PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
filters[filter_num].name);
return filter_num;
}
int ret, i;
struct sched s;
struct command_task command_task_struct, *cmd_task = &command_task_struct;
+ struct audiod_cmdline_parser_params params = {
+ .override = 0,
+ .initialize = 1,
+ .check_required = 0,
+ .check_ambiguity = 0,
+ .print_errors = 1
+ };
valid_fd_012();
- audiod_cmdline_parser(argc, argv, &conf);
+ audiod_cmdline_parser_ext(argc, argv, &conf, ¶ms);
HANDLE_VERSION_FLAG("audiod", conf);
para_drop_privileges(conf.user_arg, conf.group_arg);
config_file = configfile_exists();
if (config_file) {
- struct audiod_cmdline_parser_params params = {
- .override = 0,
- .initialize = 0,
- .check_required = 0,
- .check_ambiguity = 0
-
- };
+ params.override = 0;
+ params.initialize = 0;
+ params.check_required = 1;
+ params.check_ambiguity = 0;
+ params.print_errors = 1;
if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) {
PARA_EMERG_LOG("parse error in config file\n");
exit(EXIT_FAILURE);