X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Ftransform%2Fscale.c;h=ef2d6b456d724a10814a518a5983cd0ec5be5624;hb=ee2e9be21be59e9455a78ce3598db49e3b38e6f6;hp=47937be9e8985dfa5a84f5431e8da453cce88e4b;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git

diff --git a/src/transform/scale.c b/src/transform/scale.c
index 47937be9..ef2d6b45 100644
--- a/src/transform/scale.c
+++ b/src/transform/scale.c
@@ -50,7 +50,7 @@ static int receive(const struct sr_transform *t,
 {
 	struct context *ctx;
 	const struct sr_datafeed_analog_old *analog_old;
-	const struct sr_datafeed_analog2 *analog2;
+	const struct sr_datafeed_analog *analog;
 	struct sr_channel *ch;
 	GSList *l;
 	float *fdata;
@@ -76,10 +76,10 @@ static int receive(const struct sr_transform *t,
 			}
 		}
 		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;
 }