X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fwav.c;h=1c3f050a050434ea040f64b7b1c974d520377bc1;hb=dba3e6826e3d37309ed49dd77cde346b369bc5a9;hp=0106a58670786fde5d5483510571c09928f1ff31;hpb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;p=libsigrok.git diff --git a/input/wav.c b/input/wav.c index 0106a586..1c3f050a 100644 --- a/input/wav.c +++ b/input/wav.c @@ -85,9 +85,9 @@ static int format_match(const char *filename) static int init(struct sr_input *in, const char *filename) { - struct sr_probe *probe; + struct sr_channel *ch; struct context *ctx; - char buf[40], probename[8]; + char buf[40], channelname[8]; int i; if (get_wav_header(filename, buf) != SR_OK) @@ -113,10 +113,10 @@ static int init(struct sr_input *in, const char *filename) } for (i = 0; i < ctx->num_channels; i++) { - snprintf(probename, 8, "CH%d", i + 1); - if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, probename))) + snprintf(channelname, 8, "CH%d", i + 1); + if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, channelname))) return SR_ERR; - in->sdi->probes = g_slist_append(in->sdi->probes, probe); + in->sdi->channels = g_slist_append(in->sdi->channels, ch); } return SR_OK; @@ -178,7 +178,7 @@ static int loadfile(struct sr_input *in, const char *filename) } packet.type = SR_DF_ANALOG; packet.payload = &analog; - analog.probes = in->sdi->probes; + analog.channels = in->sdi->channels; analog.num_samples = chunk_samples; analog.mq = 0; analog.unit = 0;