java: Don't use SWIG attribute mechanism.

[libsigrok.git] / src / transform / scale.c

diff --git a/src/transform/scale.c b/src/transform/scale.c
index a65a4469d79da671565341ed2718feb09b22b804..ef2d6b456d724a10814a518a5983cd0ec5be5624 100644 (file)
--- a/src/transform/scale.c
+++ b/src/transform/scale.c
@@ -49,8 +49,8 @@ static int receive(const struct sr_transform *t,
                struct sr_datafeed_packet **packet_out)
 {
        struct context *ctx;
+       const struct sr_datafeed_analog_old *analog_old;
        const struct sr_datafeed_analog *analog;
-       const struct sr_datafeed_analog2 *analog2;
        struct sr_channel *ch;
        GSList *l;
        float *fdata;
@@ -62,24 +62,24 @@ static int receive(const struct sr_transform *t,
        ctx = t->priv;
 
        switch (packet_in->type) {
-       case SR_DF_ANALOG:
-               analog = packet_in->payload;
-               fdata = (float *)analog->data;
-               num_channels = g_slist_length(analog->channels);
+       case SR_DF_ANALOG_OLD:
+               analog_old = packet_in->payload;
+               fdata = (float *)analog_old->data;
+               num_channels = g_slist_length(analog_old->channels);
                factor = (float) ctx->factor.p / ctx->factor.q;
-               for (i = 0; i < analog->num_samples; i++) {
+               for (i = 0; i < analog_old->num_samples; i++) {
                        /* For now scale all values in all channels. */
-                       for (l = analog->channels, c = 0; l; l = l->next, c++) {
+                       for (l = analog_old->channels, c = 0; l; l = l->next, c++) {
                                ch = l->data;
                                (void)ch;
                                fdata[i * num_channels + c] *= factor;
                        }
                }
                break;
-       case SR_DF_ANALOG2:
-               analog2 = packet_in->payload;
-               analog2->encoding->scale.p *= ctx->factor.p;
-               analog2->encoding->scale.q *= ctx->factor.q;
+       case SR_DF_ANALOG:
+               analog = packet_in->payload;
+               analog->encoding->scale.p *= ctx->factor.p;
+               analog->encoding->scale.q *= ctx->factor.q;
                break;
        default:
                sr_spew("Unsupported packet type %d, ignoring.", packet_in->type);
@@ -118,7 +118,7 @@ static const struct sr_option *get_options(void)
 
        /* Default to a scaling factor of 1.0. */
        if (!options[0].def)
-               options[0].def = g_variant_ref_sink(g_variant_new(("(xt"), &p, &q));
+               options[0].def = g_variant_ref_sink(g_variant_new("(xt)", &p, &q));
 
        return options;
 }