X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=show.c;h=4c0cd8f6737667e3322307f3173da232f63ac1a4;hb=e786e625d3e3b63ea5e85b98c9e1f0281abdc2d5;hp=e3e9c825758e5f548baa1b7f77a71f9bbb14bb64;hpb=b4eece7c5f666690fdbe1923cd3bdc7cf9425d98;p=sigrok-cli.git

diff --git a/show.c b/show.c
index e3e9c82..4c0cd8f 100644
--- a/show.c
+++ b/show.c
@@ -30,9 +30,8 @@ static gint sort_inputs(gconstpointer a, gconstpointer b)
 
 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)
@@ -55,7 +54,7 @@ void show_version(void)
 {
 	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;
@@ -99,11 +98,12 @@ void show_version(void)
 	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);
@@ -550,12 +550,13 @@ void show_dev_detail(void)
 #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++) {
@@ -583,8 +584,13 @@ void show_pd_detail(void)
 			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 {
@@ -638,3 +644,43 @@ void show_pd_detail(void)
 }
 #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);
+}
+