From: Frank Stettner <redacted>
Date: Thu, 26 Oct 2017 10:56:02 +0000 (+0200)
Subject: output/analog: Display META packets
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=688e44ae06610d64ef90b720cd61262e5b606d55;p=libsigrok.git

output/analog: Display META packets
---

diff --git a/src/output/analog.c b/src/output/analog.c
index cd1764b8..f5d23e6f 100644
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -75,6 +75,9 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 {
 	struct context *ctx;
 	const struct sr_datafeed_analog *analog;
+	const struct sr_datafeed_meta *meta;
+	const struct sr_config *src;
+	const struct sr_key_info *srci;
 	struct sr_channel *ch;
 	GSList *l;
 	float *fdata;
@@ -94,6 +97,28 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
 	case SR_DF_FRAME_END:
 		*out = g_string_new("FRAME-END\n");
 		break;
+	case SR_DF_META:
+		meta = packet->payload;
+		for (l = meta->config; l; l = l->next) {
+			src = l->data;
+			if (!(srci = sr_key_info_get(SR_KEY_CONFIG, src->key)))
+				return SR_ERR;
+			*out = g_string_sized_new(512);
+			g_string_append(*out, "META ");
+			g_string_append_printf(*out, "%s: ", srci->id);
+			if (srci->datatype == SR_T_BOOL) {
+				g_string_append_printf(*out, "%u",
+					g_variant_get_boolean(src->data));
+			} else if (srci->datatype == SR_T_FLOAT) {
+				g_string_append_printf(*out, "%f",
+					g_variant_get_double(src->data));
+			} else if (srci->datatype == SR_T_UINT64) {
+				g_string_append_printf(*out, "%" PRIu64,
+					g_variant_get_uint64(src->data));
+			}
+			g_string_append(*out, "\n");
+		}
+		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
 		num_channels = g_slist_length(analog->meaning->channels);