ref: 28201684a5e78fbc2aa9cff1eb1a9180b4d58c7a
parent: e4d26075cb126c4aa011f1638080085f9c3bc723
author: Fabien Sanglard <[email protected]>
date: Sat Dec 22 20:02:46 EST 2012
Removed more warnings.
--- a/Game/src/audiolib/_multivc.h
+++ b/Game/src/audiolib/_multivc.h
@@ -99,11 +99,11 @@
playbackstatus ( *GetSound )( struct VoiceNode *voice );
void ( *mix )( unsigned long position, unsigned long rate,
- const char *start, unsigned long length );
+ uint8_t *start, unsigned long length );
- char *NextBlock;
- char *LoopStart;
- char *LoopEnd;
+ uint8_t *NextBlock;
+ uint8_t *LoopStart;
+ uint8_t *LoopEnd;
unsigned LoopCount;
unsigned long LoopSize;
unsigned long BlockLength;
@@ -111,7 +111,7 @@
unsigned long PitchScale;
unsigned long FixedPointBufferSize;
- char *sound;
+ uint8_t *sound;
unsigned long length;
unsigned long SamplingRate;
unsigned long RateScale;
--- a/Game/src/audiolib/fx_man.c
+++ b/Game/src/audiolib/fx_man.c
@@ -622,7 +622,7 @@
int FX_PlayVOC
(
- char *ptr,
+ uint8_t *ptr,
int pitchoffset,
int vol,
int left,
@@ -688,7 +688,7 @@
int FX_PlayWAV
(
- char *ptr,
+ uint8_t *ptr,
int32_t pitchoffset,
int32_t vol,
int32_t left,
--- a/Game/src/audiolib/fx_man.h
+++ b/Game/src/audiolib/fx_man.h
@@ -106,12 +106,12 @@
int FX_SetPitch( int handle, int pitchoffset );
int FX_SetFrequency( int handle, int frequency );
-int FX_PlayVOC( char *ptr, int pitchoffset, int vol, int left, int right,
+int FX_PlayVOC( uint8_t *ptr, int pitchoffset, int vol, int left, int right,
int priority, uint32_t callbackval );
int FX_PlayLoopedVOC( uint8_t *ptr, int32_t loopstart, int32_t loopend,
int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
uint32_t callbackval );
-int FX_PlayWAV( char *ptr, int pitchoffset, int vol, int left, int right,
+int FX_PlayWAV( uint8_t *ptr, int pitchoffset, int vol, int left, int right,
int priority, uint32_t callbackval );
int FX_PlayLoopedWAV( uint8_t *ptr, int32_t loopstart, int32_t loopend,
int32_t pitchoffset, int32_t vol, int32_t left, int32_t right, int32_t priority,
--- a/Game/src/audiolib/multivoc.c
+++ b/Game/src/audiolib/multivoc.c
@@ -288,7 +288,7 @@
static void MV_Mix( VoiceNode *voice )
{- char *start;
+ uint8_t *start;
int length;
long voclength;
unsigned long position;
@@ -538,7 +538,7 @@
unsigned char *ptr;
int blocktype;
int lastblocktype;
- unsigned long blocklength;
+ uint32_t blocklength;
unsigned long samplespeed;
unsigned int tc;
int packtype;
@@ -2163,8 +2163,8 @@
(
uint8_t *ptr,
unsigned long length,
- char *loopstart,
- char *loopend,
+ uint8_t *loopstart,
+ uint8_t *loopend,
unsigned rate,
int pitchoffset,
int vol,
@@ -2230,7 +2230,7 @@
int MV_PlayWAV
(
- char *ptr,
+ uint8_t *ptr,
int pitchoffset,
int vol,
int left,
@@ -2499,7 +2499,7 @@
int MV_PlayVOC
(
- char *ptr,
+ uint8_t *ptr,
int pitchoffset,
int vol,
int left,
@@ -2549,7 +2549,7 @@
}
// Make sure it's a valid VOC file.
- status = strncmp( ptr, "Creative Voice File", 19 );
+ status = strncmp( (char*)ptr, "Creative Voice File", 19 );
if ( status != 0 )
{MV_SetErrorCode( MV_InvalidVOCFile );
--- a/Game/src/audiolib/multivoc.h
+++ b/Game/src/audiolib/multivoc.h
@@ -95,10 +95,10 @@
unsigned rate, int pitchoffset, int vol, int left,
int right, int priority, unsigned long callbackval );
int MV_PlayLoopedRaw( uint8_t *ptr, unsigned long length,
- char *loopstart, char *loopend, unsigned rate, int pitchoffset,
+ uint8_t *loopstart, uint8_t *loopend, unsigned rate, int pitchoffset,
int vol, int left, int right, int priority,
unsigned long callbackval );
-int MV_PlayWAV( char *ptr, int pitchoffset, int vol, int left,
+int MV_PlayWAV( uint8_t *ptr, int pitchoffset, int vol, int left,
int right, int priority, unsigned long callbackval );
int MV_PlayWAV3D( uint8_t *ptr, int pitchoffset, int angle, int distance,
int priority, unsigned long callbackval );
@@ -107,7 +107,7 @@
unsigned long callbackval );
int MV_PlayVOC3D( uint8_t *ptr, int pitchoffset, int angle, int distance,
int priority, unsigned long callbackval );
-int MV_PlayVOC( char *ptr, int pitchoffset, int vol, int left, int right,
+int MV_PlayVOC( uint8_t * ptr, int pitchoffset, int vol, int left, int right,
int priority, unsigned long callbackval );
int MV_PlayLoopedVOC( uint8_t *ptr, long loopstart, long loopend,
int pitchoffset, int vol, int left, int right, int priority,