From: Bert Vermeulen Date: Tue, 19 Aug 2014 14:49:27 +0000 (+0200) Subject: input/wav: Send END packet on cleanup. X-Git-Tag: libsigrok-0.4.0~1105 X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=0a4d68f74b720f089966525055d91b0b026b7fa1;p=libsigrok.git input/wav: Send END packet on cleanup. --- diff --git a/src/input/wav.c b/src/input/wav.c index 5669e8a4..fabe92c7 100644 --- a/src/input/wav.c +++ b/src/input/wav.c @@ -238,17 +238,9 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples) static int receive(const struct sr_input *in, GString *buf) { - struct sr_datafeed_packet packet; struct context *inc; int offset, chunk_samples, total_samples, processed, max_chunk_samples, num_samples, i; - if (buf->len == 0) { - /* End of stream. */ - packet.type = SR_DF_END; - sr_session_send(in->sdi, &packet); - return SR_OK; - } - g_string_append_len(in->buf, buf->str, buf->len); if (!in->priv) { @@ -308,8 +300,16 @@ static int receive(const struct sr_input *in, GString *buf) static int cleanup(struct sr_input *in) { - g_free(in->priv); - in->priv = NULL; + struct sr_datafeed_packet packet; + + if (in->priv) { + /* End of stream. */ + packet.type = SR_DF_END; + sr_session_send(in->sdi, &packet); + + g_free(in->priv); + in->priv = NULL; + } return SR_OK; }