X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=b6d55888bf54d3499f4d694ae061f80235ab94a6;hb=c4a46475a64c18eabc7f1d039045c7e03ccb0d01;hp=75f1ecce8c2116deee6a3296c58cf9c895cab57e;hpb=54ee427df0d923c8e17f3dc8ee57552b6c5fd57b;p=libsigrok.git diff --git a/src/input/wav.c b/src/input/wav.c index 75f1ecce..b6d55888 100644 --- a/src/input/wav.c +++ b/src/input/wav.c @@ -51,6 +51,7 @@ struct context { int num_channels; int unitsize; gboolean found_data; + gboolean create_channels; }; static int parse_wav_header(GString *buf, struct context *inc) @@ -150,10 +151,15 @@ static int format_match(GHashTable *metadata, unsigned int *confidence) static int init(struct sr_input *in, GHashTable *options) { + struct context *inc; + (void)options; in->sdi = g_malloc0(sizeof(struct sr_dev_inst)); in->priv = g_malloc0(sizeof(struct context)); + inc = in->priv; + + inc->create_channels = TRUE; return SR_OK; } @@ -197,10 +203,11 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples) inc = in->priv; + total_samples = num_samples * inc->num_channels; + fdata = g_malloc0(total_samples * sizeof(float)); s = in->buf->str + offset; - fdata = g_malloc0(CHUNK_SIZE * sizeof(float)); d = (char *)fdata; - total_samples = num_samples * inc->num_channels; + for (samplenum = 0; samplenum < total_samples; samplenum++) { if (inc->fmt_code == WAVE_FORMAT_PCM_) { switch (inc->unitsize) { @@ -313,7 +320,7 @@ static int receive(struct sr_input *in, GString *buf) { struct context *inc; int ret; - char channelname[8]; + char channelname[16]; g_string_append_len(in->buf, buf->str, buf->len); @@ -333,11 +340,15 @@ static int receive(struct sr_input *in, GString *buf) else if (ret != SR_OK) return ret; - for (int i = 0; i < inc->num_channels; i++) { - snprintf(channelname, sizeof(channelname), "CH%d", i + 1); - sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname); + if (inc->create_channels) { + for (int i = 0; i < inc->num_channels; i++) { + snprintf(channelname, sizeof(channelname), "CH%d", i + 1); + sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname); + } } + inc->create_channels = FALSE; + /* sdi is ready, notify frontend. */ in->sdi_ready = TRUE; return SR_OK; @@ -367,9 +378,13 @@ static int end(struct sr_input *in) static int reset(struct sr_input *in) { - struct context *inc = in->priv; + memset(in->priv, 0, sizeof(struct context)); + + /* + * We only want to create the sigrok channels once, so + * inc->create_channels won't be set to TRUE this time around. + */ - inc->started = FALSE; g_string_truncate(in->buf, 0); return SR_OK;