/*
- * Copyright (C) 2011-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2011-2013 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
return -E_AO_PTHREAD;
}
-static void aow_post_select(__a_unused struct sched *s,
+static int aow_post_select(__a_unused struct sched *s,
struct task *t)
{
struct writer_node *wn = container_of(t, struct writer_node, task);
if (ret < 0)
goto remove_btrn;
if (ret == 0)
- return;
+ return 0;
get_btr_sample_rate(wn->btrn, &rate);
get_btr_channels(wn->btrn, &ch);
get_btr_sample_format(wn->btrn, &format);
ret = aow_create_thread(wn);
if (ret < 0)
goto remove_thread_btrn;
- return;
+ return 0;
}
pthread_mutex_lock(&pawd->mutex);
ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
remove_btrn:
btr_remove_node(&wn->btrn);
out:
- t->error = ret;
+ return ret;
}
__malloc static void *aow_parse_config_or_die(int argc, char **argv)
struct ao_write_args_info *conf = para_calloc(sizeof(*conf));
/* exits on errors */
- ao_cmdline_parser(argc, argv, conf);
+ ao_write_cmdline_parser(argc, argv, conf);
return conf;
}
static void aow_free_config(void *conf)
{
- ao_cmdline_parser_free(conf);
+ ao_write_cmdline_parser_free(conf);
}
/**
ao_info **driver_list;
char **dh; /* detailed help */
- ao_cmdline_parser_init(&dummy);
+ ao_write_cmdline_parser_init(&dummy);
w->close = aow_close;
w->pre_select = aow_pre_select;
w->post_select = aow_post_select;
w->parse_config_or_die = aow_parse_config_or_die;
w->free_config = aow_free_config;
- w->help = (struct ggo_help) {
- .short_help = ao_write_args_info_help,
- };
+ w->help = (struct ggo_help)DEFINE_GGO_HELP(ao_write);
/* create detailed help containing all supported drivers/options */
for (i = 0; ao_write_args_info_detailed_help[i]; i++)
; /* nothing */
}
dh[num_lines] = NULL;
w->help.detailed_help = (const char **)dh;
- ao_cmdline_parser_free(&dummy);
+ ao_write_cmdline_parser_free(&dummy);
ao_shutdown();
}