Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCC being GCC-ey. Fix a couple errors and warnings

Browse Source
This commit is contained in:
Shyotl
2012-07-18 21:27:02 -05:00
parent 5fcdbfdd9e
commit 643844c01d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/llaudio/llaudioengine_fmodex.cpp
View File

@@ -95,7 +95,7 @@ inline bool Check_FMOD_Error(FMOD_RESULT result, const char *string)
return true; return true;
} }
void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) void* F_STDCALL decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
{ {
if(type & FMOD_MEMORY_STREAM_DECODE) if(type & FMOD_MEMORY_STREAM_DECODE)
{ {
@@ -107,14 +107,14 @@ void* __stdcall decode_alloc(unsigned int size, FMOD_MEMORY_TYPE type, const cha
} }
return new char[size]; return new char[size];
} }
void* __stdcall decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr) void* F_STDCALL decode_realloc(void *ptr, unsigned int size, FMOD_MEMORY_TYPE type, const char *sourcestr)
{ {
memset(ptr,0,size); memset(ptr,0,size);
return ptr; return ptr;
} }
void __stdcall decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr) void F_STDCALL decode_dealloc(void *ptr, FMOD_MEMORY_TYPE type, const char *sourcestr)
{ {
delete[] ptr; delete[] (char*)ptr;
} }
bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata) bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
@@ -130,7 +130,7 @@ bool LLAudioEngine_FMODEX::init(const S32 num_channels, void* userdata)
LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL; LL_DEBUGS("AppInit") << "LLAudioEngine_FMODEX::init() initializing FMOD" << LL_ENDL;
result = FMOD::Memory_Initialize(NULL, NULL, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE); result = FMOD::Memory_Initialize(NULL, 0, &decode_alloc, &decode_realloc, &decode_dealloc, FMOD_MEMORY_STREAM_DECODE | FMOD_MEMORY_STREAM_FILE);
if(Check_FMOD_Error(result, "FMOD::Memory_Initialize")) if(Check_FMOD_Error(result, "FMOD::Memory_Initialize"))
return false; return false;