X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fbinary.c;h=8484a80e24ff81ef4c0ede192b2a7af324bf1750;hb=ac070c7744471350e38836a58dd565750d96ce7f;hp=1c786baebfc2c71ec6b833fa35ee7f16b476deea;hpb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;p=libsigrok.git diff --git a/input/binary.c b/input/binary.c index 1c786bae..8484a80e 100644 --- a/input/binary.c +++ b/input/binary.c @@ -1,7 +1,7 @@ /* * This file is part of the sigrok project. * - * Copyright (C) 2010-2012 Bert Vermeulen + * Copyright (C) 2013 Bert Vermeulen * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ static int format_match(const char *filename) return TRUE; } -static int init(struct sr_input *in) +static int init(struct sr_input *in, const char *filename) { struct sr_probe *probe; int num_probes, i; @@ -58,6 +58,8 @@ static int init(struct sr_input *in) char *param; struct context *ctx; + (void)filename; + if (!(ctx = g_try_malloc0(sizeof(*ctx)))) { sr_err("Input format context malloc failed."); return SR_ERR_MALLOC; @@ -119,9 +121,11 @@ static int loadfile(struct sr_input *in, const char *filename) if (ctx->samplerate) { packet.type = SR_DF_META; packet.payload = &meta; - src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&ctx->samplerate); + src = sr_config_new(SR_CONF_SAMPLERATE, + g_variant_new_uint64(ctx->samplerate)); meta.config = g_slist_append(NULL, src); sr_session_send(in->sdi, &packet); + sr_config_free(src); } /* Chop up the input file into chunks & send it to the session bus. */