static gint sort_outputs(gconstpointer a, gconstpointer b)
{
- const struct sr_output_format *oa = a, *ob = b;
-
- return strcmp(oa->id, ob->id);
+ return strcmp(sr_output_id_get((struct sr_output_module *)a),
+ sr_output_id_get((struct sr_output_module *)b));
}
static gint sort_drivers(gconstpointer a, gconstpointer b)
{
struct sr_dev_driver **drivers, *driver;
struct sr_input_format **inputs, *input;
- struct sr_output_format **outputs, *output;
+ const struct sr_output_module **outputs, *output;
const GSList *l;
GSList *sl;
int i;
printf("Supported output formats:\n");
outputs = sr_output_list();
for (sl = NULL, i = 0; outputs[i]; i++)
- sl = g_slist_append(sl, outputs[i]);
+ sl = g_slist_append(sl, (gpointer)outputs[i]);
sl = g_slist_sort(sl, sort_outputs);
for (l = sl; l; l = l->next) {
output = l->data;
- printf(" %-20s %s\n", output->id, output->description);
+ printf(" %-20s %s\n", sr_output_id_get(output),
+ sr_output_description_get(output));
}
printf("\n");
g_slist_free(sl);
#ifdef HAVE_SRD
void show_pd_detail(void)
{
- GSList *l, *ll, *ol;
struct srd_decoder *dec;
struct srd_decoder_option *o;
- char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
struct srd_channel *pdch;
struct srd_decoder_annotation_row *r;
+ GSList *l, *ll, *ol;
+ int idx;
+ char **pdtokens, **pdtok, *optsep, **ann, *val, *doc;
pdtokens = g_strsplit(opt_pds, ",", -1);
for (pdtok = pdtokens; *pdtok; pdtok++) {
for (l = dec->annotation_rows; l; l = l->next) {
r = l->data;
printf("- %s (%s): ", r->id, r->desc);
- for (ll = r->ann_classes; ll; ll = ll->next)
- printf("%d ", GPOINTER_TO_INT(ll->data));
+ for (ll = r->ann_classes; ll; ll = ll->next) {
+ idx = GPOINTER_TO_INT(ll->data);
+ ann = g_slist_nth_data(dec->annotations, idx);
+ printf("%s", ann[0]);
+ if (ll->next)
+ printf(", ");
+ }
printf("\n");
}
} else {
}
#endif
+void show_output(void)
+{
+ const struct sr_output_module *omod;
+ const struct sr_option *opt;
+ GSList *l;
+ char *s, **tok;
+
+ tok = g_strsplit(opt_output_format, ":", 0);
+ if (!tok[0] || !(omod = sr_output_find(tok[0])))
+ g_critical("Output module '%s' not found.", opt_output_format);
+
+ printf("ID: %s\nName: %s\n", sr_output_id_get(omod),
+ sr_output_name_get(omod));
+ printf("Description: %s\n", sr_output_description_get(omod));
+ if ((opt = sr_output_options_get(omod))) {
+ printf("Options:\n");
+ while (opt->id) {
+ printf(" %s: %s", opt->id, opt->desc);
+ if (opt->def) {
+ s = g_variant_print(opt->def, FALSE);
+ printf(" (default %s", s);
+ g_free(s);
+ if (opt->values) {
+ printf(", possible values ");
+ for (l = opt->values; l; l = l->next) {
+ s = g_variant_print((GVariant *)l->data, FALSE);
+ printf("%s%s", s, l->next ? ", " : "");
+ g_free(s);
+ }
+ }
+ printf(")");
+ }
+ printf("\n");
+ opt++;
+ }
+ sr_output_options_free(omod);
+ }
+ g_strfreev(tok);
+}
+