X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fols.c;h=c3b5799c7d9709a50f951ecd42462089f2abbc72;hb=2c9c0df86eaf9b64cf0ba7537b3c3c84f2da4686;hp=97694b8f7e282e9ba25605c3c1f9c6b499e38ba9;hpb=13d8e03c4f9fb6fe9c5f682ab957173effe42d43;p=libsigrok.git

diff --git a/output/ols.c b/output/ols.c
index 97694b8f..c3b5799c 100644
--- a/output/ols.c
+++ b/output/ols.c
@@ -51,7 +51,8 @@ static int init(struct sr_output *o)
 	struct context *ctx;
 	struct sr_probe *probe;
 	GSList *l;
-	uint64_t *samplerate, tmp;
+	GVariant *gvar;
+	uint64_t samplerate;
 	int num_enabled_probes;
 
 	if (!(ctx = g_try_malloc(sizeof(struct context)))) {
@@ -69,16 +70,16 @@ static int init(struct sr_output *o)
 	}
 	ctx->unitsize = (num_enabled_probes + 7) / 8;
 
-	if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE))
-		o->sdi->driver->config_get(SR_CONF_SAMPLERATE,
-				(const void **)&samplerate, o->sdi);
-	else {
-		tmp = 0;
-		samplerate = &tmp;
+	if (o->sdi->driver && sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) {
+		o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi);
+		samplerate = g_variant_get_uint64(gvar);
+		g_variant_unref(gvar);
+	} else {
+		samplerate = 0;
 	}
 
 	ctx->header = g_string_sized_new(512);
-	g_string_append_printf(ctx->header, ";Rate: %"PRIu64"\n", *samplerate);
+	g_string_append_printf(ctx->header, ";Rate: %"PRIu64"\n", samplerate);
 	g_string_append_printf(ctx->header, ";Channels: %d\n", num_enabled_probes);
 	g_string_append_printf(ctx->header, ";EnabledChannels: -1\n");
 	g_string_append_printf(ctx->header, ";Compressed: true\n");