X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=a6369f4d4bd60778035e3d4597a22c45334bb774;hb=08f023fe97e402d68106299d04726f9094f00c45;hp=8ec3141ec9cf02ec1547052533238f7155f52386;hpb=b20eb52055042a1a1dd61d928a3f3a4b706c7d01;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index 8ec3141e..a6369f4d 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)
@@ -124,7 +125,7 @@ static int parse_wav_header(GString *buf, struct context *inc)
 	return SR_OK;
 }
 
-static int format_match(GHashTable *metadata)
+static int format_match(GHashTable *metadata, unsigned int *confidence)
 {
 	GString *buf;
 	int ret;
@@ -143,15 +144,22 @@ static int format_match(GHashTable *metadata)
 	if ((ret = parse_wav_header(buf, NULL)) != SR_OK)
 		return ret;
 
+	*confidence = 1;
+
 	return SR_OK;
 }
 
 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;
 }
@@ -195,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) {
@@ -244,24 +253,14 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 static int process_buffer(struct sr_input *in)
 {
 	struct context *inc;
-	struct sr_datafeed_packet packet;
-	struct sr_datafeed_meta meta;
-	struct sr_config *src;
 	int offset, chunk_samples, total_samples, processed, max_chunk_samples;
 	int num_samples, i;
 
 	inc = in->priv;
 	if (!inc->started) {
 		std_session_send_df_header(in->sdi);
-
-		packet.type = SR_DF_META;
-		packet.payload = &meta;
-		src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
-		meta.config = g_slist_append(NULL, src);
-		sr_session_send(in->sdi, &packet);
-		g_slist_free(meta.config);
-		sr_config_free(src);
-
+		(void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+			g_variant_new_uint64(inc->samplerate));
 		inc->started = TRUE;
 	}
 
@@ -311,7 +310,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);
 
@@ -331,11 +330,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;
@@ -365,9 +368,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;