diff --git a/src/kits/game/FileGameSound.cpp b/src/kits/game/FileGameSound.cpp index 5efc23f26d..7463864a9f 100644 --- a/src/kits/game/FileGameSound.cpp +++ b/src/kits/game/FileGameSound.cpp @@ -32,14 +32,6 @@ struct _gs_media_tracker { // Local utility functions ----------------------------------------------- -template -inline bool -FillBuffer(_gs_ramp* ramp, T* dest, const T* src, size_t* bytes) -{ - return ::FillBuffer(ramp, dest, src, bytes); -} - - template bool FillBuffer(_gs_ramp* ramp, T* dest, const T* src, size_t* bytes) @@ -220,19 +212,19 @@ BFileGameSound::FillBuffer(void* inBuffer, size_t inByteCount) break; case gs_audio_format::B_GS_S16: - rampDone = ::FillBuffer(fPausing, + rampDone = ::FillBuffer(fPausing, (int16*)&buffer[out_offset], (int16*)&fBuffer[fPlayPosition], &bytes); break; case gs_audio_format::B_GS_S32: - rampDone = ::FillBuffer(fPausing, + rampDone = ::FillBuffer(fPausing, (int32*)&buffer[out_offset], (int32*)&fBuffer[fPlayPosition], &bytes); break; case gs_audio_format::B_GS_F: - rampDone = ::FillBuffer(fPausing, + rampDone = ::FillBuffer(fPausing, (float*)&buffer[out_offset], (float*)&fBuffer[fPlayPosition], &bytes); break; diff --git a/src/kits/game/GameSoundBuffer.cpp b/src/kits/game/GameSoundBuffer.cpp index 578db6930e..294803b0fb 100644 --- a/src/kits/game/GameSoundBuffer.cpp +++ b/src/kits/game/GameSoundBuffer.cpp @@ -43,14 +43,6 @@ #include "GSUtility.h" // Sound Buffer Utility functions ---------------------------------------- -template -static inline void -ApplyMod(T* data, int64 index, float* pan) -{ - return ApplyMod(data, index, pan); -} - - template static inline void ApplyMod(T* data, int64 index, float* pan) @@ -280,7 +272,7 @@ GameSoundBuffer::Play(void * data, int64 frames) case gs_audio_format::B_GS_S16: { for (int64 i = 0; i < frames; i++) { - ApplyMod((int16*)data, i, pan); + ApplyMod((int16*)data, i, pan); UpdateMods(); } @@ -290,7 +282,7 @@ GameSoundBuffer::Play(void * data, int64 frames) case gs_audio_format::B_GS_S32: { for (int64 i = 0; i < frames; i++) { - ApplyMod((int32*)data, i, pan); + ApplyMod((int32*)data, i, pan); UpdateMods(); } @@ -300,7 +292,7 @@ GameSoundBuffer::Play(void * data, int64 frames) case gs_audio_format::B_GS_F: { for (int64 i = 0; i < frames; i++) { - ApplyMod((float*)data, i, pan); + ApplyMod((float*)data, i, pan); UpdateMods(); }