X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finput%2Fwav.c;h=f2d5db0dfcc21075293c3d9350573aff820410e8;hb=c1aae90038456a61d0f9313d34e6107c3440d3e7;hp=0c23010eb6f7c5f1dab218356c54c1cf80a4a212;hpb=5e23fcab889c62864b92aa3ad6902ce3e9f5be49;p=libsigrok.git

diff --git a/src/input/wav.c b/src/input/wav.c
index 0c23010e..f2d5db0d 100644
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/wav"
@@ -38,9 +38,9 @@
 /* Expect to find the "data" chunk within this offset from the start. */
 #define MAX_DATA_CHUNK_OFFSET    256
 
-#define WAVE_FORMAT_PCM          0x0001
-#define WAVE_FORMAT_IEEE_FLOAT   0x0003
-#define WAVE_FORMAT_EXTENSIBLE   0xfffe
+#define WAVE_FORMAT_PCM_         0x0001
+#define WAVE_FORMAT_IEEE_FLOAT_  0x0003
+#define WAVE_FORMAT_EXTENSIBLE_  0xfffe
 
 struct context {
 	gboolean started;
@@ -73,14 +73,13 @@ static int parse_wav_header(GString *buf, struct context *inc)
 		return SR_ERR_DATA;
 	}
 
-
-	if (fmt_code == WAVE_FORMAT_PCM) {
-	} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
+	if (fmt_code == WAVE_FORMAT_PCM_) {
+	} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_) {
 		if (unitsize != 4) {
 			sr_err("only 32-bit floats supported.");
 			return SR_ERR_DATA;
 		}
-	} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) {
+	} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE_) {
 		if (buf->len < 70)
 			/* Not enough for extensible header and next chunk. */
 			return SR_ERR_NA;
@@ -99,11 +98,11 @@ static int parse_wav_header(GString *buf, struct context *inc)
 		}
 		/* Real format code is the first two bytes of the GUID. */
 		fmt_code = RL16(buf->str + 44);
-		if (fmt_code != WAVE_FORMAT_PCM && fmt_code != WAVE_FORMAT_IEEE_FLOAT) {
+		if (fmt_code != WAVE_FORMAT_PCM_ && fmt_code != WAVE_FORMAT_IEEE_FLOAT_) {
 			sr_err("Only PCM and floating point samples are supported.");
 			return SR_ERR_DATA;
 		}
-		if (fmt_code == WAVE_FORMAT_IEEE_FLOAT && unitsize != 4) {
+		if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_ && unitsize != 4) {
 			sr_err("only 32-bit floats supported.");
 			return SR_ERR_DATA;
 		}
@@ -161,13 +160,12 @@ static int find_data_chunk(GString *buf, int initial_offset)
 	unsigned int offset, i;
 
 	offset = initial_offset;
-	while(offset < MIN(MAX_DATA_CHUNK_OFFSET, buf->len)) {
+	while (offset < MIN(MAX_DATA_CHUNK_OFFSET, buf->len)) {
 		if (!memcmp(buf->str + offset, "data", 4))
 			/* Skip into the samples. */
 			return offset + 8;
 		for (i = 0; i < 4; i++) {
-			if (!isalpha(buf->str[offset + i])
-					&& !isascii(buf->str[offset + i])
+			if (!isalnum(buf->str[offset + i])
 					&& !isblank(buf->str[offset + i]))
 				/* Doesn't look like a chunk ID. */
 				return -1;
@@ -196,7 +194,7 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 	memset(fdata, 0, CHUNK_SIZE);
 	total_samples = num_samples * inc->num_channels;
 	for (samplenum = 0; samplenum < total_samples; samplenum++) {
-		if (inc->fmt_code == WAVE_FORMAT_PCM) {
+		if (inc->fmt_code == WAVE_FORMAT_PCM_) {
 			sample = 0;
 			memcpy(&sample, s, inc->unitsize);
 			switch (inc->samplesize) {
@@ -370,4 +368,3 @@ SR_PRIV struct sr_input_module input_wav = {
 	.receive = receive,
 	.end = end,
 };
-