X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fwav.c;h=a6369f4d4bd60778035e3d4597a22c45334bb774;hb=fe953391bd7782813256c02350afa1996c773659;hp=b11dcc4860d5a54aae1e0259ada251a3e7741459;hpb=9e850040db5c6628e7d1f5a797d75f6bc8de7ea8;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index b11dcc48..a6369f4d 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -203,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) {
@@ -252,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;
 	}
 
@@ -319,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);