X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fanalog.c;h=e7e475fc3126ec6219ddf509c76ae02d6e77f74b;hb=e6b2b4df9dcfaf9eb6fa10f94e0aa5e039230e21;hp=d2f28b6b2853bf94d6bb2ad91eea4c750c688900;hpb=bf53457d1ddea58d1cb7e4feea83ad0cc1d63031;p=libsigrok.git

diff --git a/output/analog.c b/output/analog.c
index d2f28b6b..e7e475fc 100644
--- a/output/analog.c
+++ b/output/analog.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -36,7 +36,6 @@
 struct context {
 	int num_enabled_probes;
 	GPtrArray *probelist;
-	GString *out;
 };
 
 static int init(struct sr_output *o)
@@ -66,8 +65,6 @@ static int init(struct sr_output *o)
 		ctx->num_enabled_probes++;
 	}
 
-	ctx->out = g_string_sized_new(512);
-
 	return SR_OK;
 }
 
@@ -188,45 +185,44 @@ static void fancyprint(int unit, int mqflags, float value, GString *out)
 	g_string_append_c(out, '\n');
 }
 
-static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
-		const struct sr_datafeed_packet *packet)
+static int receive(struct sr_output *o, const struct sr_dev_inst *sdi,
+		const struct sr_datafeed_packet *packet, GString **out)
 {
 	const struct sr_datafeed_analog *analog;
-	struct context *ctx;
+	struct sr_probe *probe;
+	GSList *l;
 	const float *fdata;
-	int i, j;
+	int i, p;
 
 	(void)sdi;
 
+	*out = NULL;
 	if (!o || !o->sdi)
-		return NULL;
-	ctx = o->internal;
+		return SR_ERR_ARG;
 
-	g_string_set_size(ctx->out, 0);
 	switch (packet->type) {
-	case SR_DF_HEADER:
-		break;
 	case SR_DF_FRAME_BEGIN:
-		g_string_append_printf(ctx->out, "FRAME-BEGIN\n");
+		*out = g_string_new("FRAME-BEGIN\n");
 		break;
 	case SR_DF_FRAME_END:
-		g_string_append_printf(ctx->out, "FRAME-END\n");
+		*out = g_string_new("FRAME-END\n");
 		break;
 	case SR_DF_ANALOG:
 		analog = packet->payload;
 		fdata = (const float *)analog->data;
+		*out = g_string_sized_new(512);
 		for (i = 0; i < analog->num_samples; i++) {
-			for (j = 0; j < ctx->num_enabled_probes; j++) {
-				g_string_append_printf(ctx->out, "%s: ",
-						(char *)g_ptr_array_index(ctx->probelist, j));
+			for (l = analog->probes, p = 0; l; l = l->next, p++) {
+				probe = l->data;
+				g_string_append_printf(*out, "%s: ", probe->name);
 				fancyprint(analog->unit, analog->mqflags,
-						fdata[i + j], ctx->out);
+						fdata[i + p], *out);
 			}
 		}
 		break;
 	}
 
-	return ctx->out;
+	return SR_OK;
 }
 
 static int cleanup(struct sr_output *o)
@@ -238,7 +234,6 @@ static int cleanup(struct sr_output *o)
 	ctx = o->internal;
 
 	g_ptr_array_free(ctx->probelist, 1);
-	g_string_free(ctx->out, 1);
 	g_free(ctx);
 	o->internal = NULL;
 
@@ -250,6 +245,6 @@ SR_PRIV struct sr_output_format output_analog = {
 	.description = "Analog data",
 	.df_type = SR_DF_ANALOG,
 	.init = init,
-	.recv = receive,
+	.receive = receive,
 	.cleanup = cleanup
 };