BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

input/wav: windows: Fix a compiler warning. 

src/input/wav.c:41:0: warning: "WAVE_FORMAT_PCM" redefined
   #define WAVE_FORMAT_PCM          0x0001
   ^
  In file included from [...]/include/windows.h:86:0,
                   from [...]/include/libusb-1.0/libusb.h:70,
                   from ./src/libsigrok-internal.h:31,
                   from src/input/wav.c:28:
  [...]/include/mmsystem.h:482:0: note: this is the location of the previous definition
   #define WAVE_FORMAT_PCM 1
   ^
This commit is contained in:
Uwe Hermann 2015-04-12 18:54:43 +02:00
parent 4cd97e5ad7
commit 76598cda54
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/input/wav.c
View File

@ -38,9 +38,9 @@
/* Expect to find the "data" chunk within this offset from the start. */ /* Expect to find the "data" chunk within this offset from the start. */
#define MAX_DATA_CHUNK_OFFSET 256 #define MAX_DATA_CHUNK_OFFSET 256
#define WAVE_FORMAT_PCM 0x0001 #define WAVE_FORMAT_PCM_ 0x0001
#define WAVE_FORMAT_IEEE_FLOAT 0x0003 #define WAVE_FORMAT_IEEE_FLOAT_ 0x0003
#define WAVE_FORMAT_EXTENSIBLE 0xfffe #define WAVE_FORMAT_EXTENSIBLE_ 0xfffe
struct context { struct context {
gboolean started; gboolean started;
@ -73,13 +73,13 @@ static int parse_wav_header(GString *buf, struct context *inc)
return SR_ERR_DATA; return SR_ERR_DATA;
} }
if (fmt_code == WAVE_FORMAT_PCM) { if (fmt_code == WAVE_FORMAT_PCM_) {
} else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) { } else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_) {
if (unitsize != 4) { if (unitsize != 4) {
sr_err("only 32-bit floats supported."); sr_err("only 32-bit floats supported.");
return SR_ERR_DATA; return SR_ERR_DATA;
} }
} else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) { } else if (fmt_code == WAVE_FORMAT_EXTENSIBLE_) {
if (buf->len < 70) if (buf->len < 70)
/* Not enough for extensible header and next chunk. */ /* Not enough for extensible header and next chunk. */
return SR_ERR_NA; return SR_ERR_NA;
@ -98,11 +98,11 @@ static int parse_wav_header(GString *buf, struct context *inc)
} }
/* Real format code is the first two bytes of the GUID. */ /* Real format code is the first two bytes of the GUID. */
fmt_code = RL16(buf->str + 44); 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."); sr_err("Only PCM and floating point samples are supported.");
return SR_ERR_DATA; 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."); sr_err("only 32-bit floats supported.");
return SR_ERR_DATA; return SR_ERR_DATA;
} }
@ -195,7 +195,7 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
memset(fdata, 0, CHUNK_SIZE); memset(fdata, 0, CHUNK_SIZE);
total_samples = num_samples * inc->num_channels; total_samples = num_samples * inc->num_channels;
for (samplenum = 0; samplenum < total_samples; samplenum++) { for (samplenum = 0; samplenum < total_samples; samplenum++) {
if (inc->fmt_code == WAVE_FORMAT_PCM) { if (inc->fmt_code == WAVE_FORMAT_PCM_) {
sample = 0; sample = 0;
memcpy(&sample, s, inc->unitsize); memcpy(&sample, s, inc->unitsize);
switch (inc->samplesize) { switch (inc->samplesize) {