X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=output%2Fcsv.c;h=844ca4fe8f7aaefe1bf4cff8e8b77eb773b78376;hb=ec4063b83c9b8a0693b9837787306dd5405e076b;hp=a671c292990d11ad35724651488e98392b637092;hpb=035a1078fda93cf1da37d19b3a1d95311b99b00f;p=libsigrok.git diff --git a/output/csv.c b/output/csv.c index a671c292..844ca4fe 100644 --- a/output/csv.c +++ b/output/csv.c @@ -60,8 +60,8 @@ static int init(struct sr_output *o) struct context *ctx; struct sr_probe *probe; GSList *l; + GVariant *gvar; int num_probes; - uint64_t *samplerate; time_t t; unsigned int i; @@ -99,10 +99,10 @@ static int init(struct sr_output *o) num_probes = g_slist_length(o->sdi->probes); - if (sr_dev_has_hwcap(o->sdi, SR_CONF_SAMPLERATE)) { - o->sdi->driver->config_get(SR_DI_CUR_SAMPLERATE, - (const void **)&samplerate, o->sdi); - ctx->samplerate = *samplerate; + if (sr_dev_has_option(o->sdi, SR_CONF_SAMPLERATE)) { + o->sdi->driver->config_get(SR_CONF_SAMPLERATE, &gvar, o->sdi); + ctx->samplerate = g_variant_get_uint64(gvar); + g_variant_unref(gvar); } else ctx->samplerate = 0;