X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Ftransform%2Fscale.c;h=5b412784d3416bb573d7f3d2b981576cecec3098;hb=6cf1a87bfb803e088234e2e313891d27379880cf;hp=a65a4469d79da671565341ed2718feb09b22b804;hpb=b1aa4f34bc5f48ed9e08ff63eb762f9b0e4ceb60;p=libsigrok.git

diff --git a/src/transform/scale.c b/src/transform/scale.c
index a65a4469..5b412784 100644
--- a/src/transform/scale.c
+++ b/src/transform/scale.c
@@ -50,12 +50,6 @@ static int receive(const struct sr_transform *t,
 {
 	struct context *ctx;
 	const struct sr_datafeed_analog *analog;
-	const struct sr_datafeed_analog2 *analog2;
-	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;
@@ -64,22 +58,8 @@ static int receive(const struct sr_transform *t,
 	switch (packet_in->type) {
 	case SR_DF_ANALOG:
 		analog = packet_in->payload;
-		fdata = (float *)analog->data;
-		num_channels = g_slist_length(analog->channels);
-		factor = (float) ctx->factor.p / ctx->factor.q;
-		for (i = 0; i < analog->num_samples; i++) {
-			/* For now scale all values in all channels. */
-			for (l = analog->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;
+		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 +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;
 }