Merge "Fix compiler warnings in sonivox and enable -Werror."
diff --git a/arm-wt-22k/Android.mk b/arm-wt-22k/Android.mk
index b9ea9fd..4871d54 100644
--- a/arm-wt-22k/Android.mk
+++ b/arm-wt-22k/Android.mk
@@ -53,7 +53,7 @@
-D _8_BIT_SAMPLES -D _FILTER_ENABLED \
-D DLS_SYNTHESIZER \
-D _REVERB_ENABLED \
- -Wno-unused-parameter \
+ -Wno-unused-parameter -Werror \
# not using these options
# -D _WAVE_PARSER
diff --git a/arm-wt-22k/lib_src/eas_mdls.c b/arm-wt-22k/lib_src/eas_mdls.c
index b08e24e..f941961 100644
--- a/arm-wt-22k/lib_src/eas_mdls.c
+++ b/arm-wt-22k/lib_src/eas_mdls.c
@@ -322,6 +322,7 @@
static const S_DLS_ART_VALUES defaultArt =
{
+ {
0, /* not modified */
-851, /* Mod LFO frequency: 5 Hz */
-7973, /* Mod LFO delay: 10 milliseconds */
@@ -379,6 +380,7 @@
1000, /* Default CC91 to reverb send: 100.0% */
0, /* Default chorus send: 0.0% */
1000 /* Default CC93 to chorus send: 100.0% */
+ }
};
/*------------------------------------
@@ -565,7 +567,7 @@
}
/* must have a ptbl chunk */
- if ((ptblSize == 0) || (ptblSize > DLS_MAX_WAVE_COUNT * sizeof(POOLCUE) + sizeof(POOLTABLE)))
+ if ((ptblSize == 0) || (ptblSize > (EAS_I32) (DLS_MAX_WAVE_COUNT * sizeof(POOLCUE) + sizeof(POOLTABLE))))
{
{ /* dpp: EAS_ReportEx(_EAS_SEVERITY_ERROR, "No ptbl chunk found"); */ }
return EAS_ERROR_UNRECOGNIZED_FORMAT;
diff --git a/arm-wt-22k/lib_src/eas_pan.h b/arm-wt-22k/lib_src/eas_pan.h
index cb0a90d..7b3cba5 100644
--- a/arm-wt-22k/lib_src/eas_pan.h
+++ b/arm-wt-22k/lib_src/eas_pan.h
@@ -31,7 +31,7 @@
*----------------------------------------------------------------------------
*/
-#ifndef EAS_PAN_H
+#ifndef _EAS_PAN_H
#define _EAS_PAN_H
#include "eas_types.h"
@@ -62,5 +62,5 @@
*/
void EAS_CalcPanControl (EAS_INT pan, EAS_I16 *pGainLeft, EAS_I16 *pGainRight);
-#endif
+#endif /* #ifndef _EAS_PAN_H */
