diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-07 23:36:30 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-07 23:36:30 +0100 |
| commit | 7b35ca80124bd51929cca4422738713a8684df00 (patch) | |
| tree | d3c47896ce48494e7f875aba1a1da460b563dd43 /dumb | |
| parent | 001e68d2e20435662dfebd27dddc470faa383fad (diff) | |
warning/compile fixes for 0.3.2-rc1
Diffstat (limited to 'dumb')
| -rw-r--r-- | dumb/dumb-kode54/src/helpers/resamp2.inc | 2 | ||||
| -rw-r--r-- | dumb/dumb-kode54/src/helpers/resample.inc | 4 | ||||
| -rw-r--r-- | dumb/dumb-kode54/src/helpers/riff.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/dumb/dumb-kode54/src/helpers/resamp2.inc b/dumb/dumb-kode54/src/helpers/resamp2.inc index f4cf860d..ecdc400c 100644 --- a/dumb/dumb-kode54/src/helpers/resamp2.inc +++ b/dumb/dumb-kode54/src/helpers/resamp2.inc @@ -103,7 +103,7 @@ static int process_pickup(DUMB_RESAMPLER *resampler) /* Create stereo destination resampler. */
#define SUFFIX3 _2
#define VOLUME_PARAMETERS DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right
-#define VOLUME_VARIABLES lvol, lvolr, lvold, lvolt, lvolm, rvol, rvolr, rvold, rvolt, rvolm
+#define VOLUME_VARIABLES lvol=0, lvolr=0, lvold=0, lvolt=0, lvolm=0, rvol=0, rvolr=0, rvold=0, rvolt=0, rvolm=0
#define SET_VOLUME_VARIABLES { \
if ( volume_left ) { \
lvolr = (int)(volume_left->volume * 16777216.0); \
diff --git a/dumb/dumb-kode54/src/helpers/resample.inc b/dumb/dumb-kode54/src/helpers/resample.inc index 0cfc0f22..d3253cd5 100644 --- a/dumb/dumb-kode54/src/helpers/resample.inc +++ b/dumb/dumb-kode54/src/helpers/resample.inc @@ -106,7 +106,7 @@ DUMB_RESAMPLER *dumb_start_resampler(SRCTYPE *src, int src_channels, long pos, l #define COPYSRC(dstarray, dstindex, srcarray, srcindex) (dstarray)[dstindex] = (srcarray)[srcindex]
#define COPYSRC2(dstarray, dstindex, condition, srcarray, srcindex) (dstarray)[dstindex] = condition ? (srcarray)[srcindex] : 0
#define MONO_DEST_VOLUME_PARAMETERS DUMB_VOLUME_RAMP_INFO * volume
-#define MONO_DEST_VOLUME_VARIABLES vol, volr, vold, volt, volm
+#define MONO_DEST_VOLUME_VARIABLES vol=0, volr=0, vold=0, volt=0, volm=0
#define MONO_DEST_VOLUME_ZEROS 0
#define SET_MONO_DEST_VOLUME_VARIABLES { \
if ( volume ) { \
@@ -177,7 +177,7 @@ DUMB_RESAMPLER *dumb_start_resampler(SRCTYPE *src, int src_channels, long pos, l }
#define MONO_DEST_VOLUME_PARAMETERS DUMB_VOLUME_RAMP_INFO * volume_left, DUMB_VOLUME_RAMP_INFO * volume_right
-#define MONO_DEST_VOLUME_VARIABLES lvol, lvolr, lvold, lvolt, lvolm, rvol, rvolr, rvold, rvolt, rvolm
+#define MONO_DEST_VOLUME_VARIABLES lvol=0, lvolr=0, lvold=0, lvolt=0, lvolm=0, rvol=0, rvolr=0, rvold=0, rvolt=0, rvolm=0
#define MONO_DEST_VOLUME_ZEROS 0, 0
#define SET_MONO_DEST_VOLUME_VARIABLES { \
if ( volume_left ) { \
diff --git a/dumb/dumb-kode54/src/helpers/riff.c b/dumb/dumb-kode54/src/helpers/riff.c index 75c55572..62a7eccc 100644 --- a/dumb/dumb-kode54/src/helpers/riff.c +++ b/dumb/dumb-kode54/src/helpers/riff.c @@ -1,6 +1,7 @@ #include "internal/riff.h"
#include <stdlib.h>
+#include <string.h>
struct riff * riff_parse( unsigned char * ptr, unsigned size, unsigned proper )
{
|