X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Ftransform%2Fscale.c;h=5b412784d3416bb573d7f3d2b981576cecec3098;hb=6cf1a87bfb803e088234e2e313891d27379880cf;hp=ae82ee3f2a43d1857f6c8f3055bd8a1c6ccb9c19;hpb=edb691fcedb767093885c61d19d8d490c9c8c9c2;p=libsigrok.git diff --git a/src/transform/scale.c b/src/transform/scale.c index ae82ee3f..5b412784 100644 --- a/src/transform/scale.c +++ b/src/transform/scale.c @@ -49,33 +49,13 @@ 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; - struct sr_channel *ch; - GSList *l; - float *fdata; - float factor; - int i, num_channels, c; if (!t || !t->sdi || !packet_in || !packet_out) return SR_ERR_ARG; ctx = t->priv; switch (packet_in->type) { - 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_old->num_samples; i++) { - /* For now scale all values in all channels. */ - 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_ANALOG: analog = packet_in->payload; analog->encoding->scale.p *= ctx->factor.p; @@ -118,7 +98,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; }