output/wav: Minor code cleanup.

[libsigrok.git] / src / output / analog.c

diff --git a/src/output/analog.c b/src/output/analog.c
index f81e683c7665a7acd3481a73994774a2aaaf98e3..c76392caeffbf488ad373e84d1eb92bd0385f41e 100644 (file)
--- a/src/output/analog.c
+++ b/src/output/analog.c
@@ -46,7 +46,7 @@ static int init(struct sr_output *o, GHashTable *options)
                sr_err("Output module context malloc failed.");
                return SR_ERR_MALLOC;
        }
-       o->internal = ctx;
+       o->priv = ctx;
 
        /* Get the number of channels and their names. */
        ctx->channellist = g_ptr_array_new();
@@ -222,7 +222,7 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
        struct sr_channel *ch;
        GSList *l;
        const float *fdata;
-       int i, p;
+       int num_channels, i, c;
 
        *out = NULL;
        if (!o || !o->sdi)
@@ -239,12 +239,13 @@ static int receive(const struct sr_output *o, const struct sr_datafeed_packet *p
                analog = packet->payload;
                fdata = (const float *)analog->data;
                *out = g_string_sized_new(512);
+               num_channels = g_slist_length(analog->channels);
                for (i = 0; i < analog->num_samples; i++) {
-                       for (l = analog->channels, p = 0; l; l = l->next, p++) {
+                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                g_string_append_printf(*out, "%s: ", ch->name);
                                fancyprint(analog->unit, analog->mqflags,
-                                               fdata[i + p], *out);
+                                               fdata[i * num_channels + c], *out);
                        }
                }
                break;
@@ -259,11 +260,11 @@ static int cleanup(struct sr_output *o)
 
        if (!o || !o->sdi)
                return SR_ERR_ARG;
-       ctx = o->internal;
+       ctx = o->priv;
 
        g_ptr_array_free(ctx->channellist, 1);
        g_free(ctx);
-       o->internal = NULL;
+       o->priv = NULL;
 
        return SR_OK;
 }