diff options
| author | Lars Persson | 2010-10-13 07:14:38 +0000 |
|---|---|---|
| committer | Lars Persson | 2010-10-13 07:14:38 +0000 |
| commit | c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3 (patch) | |
| tree | 812422f7f16527311b658b7b196d55753372d6f6 /engines/toon/audio.cpp | |
| parent | 6527c01cb501958bc04117da3d965b956e77704c (diff) | |
| download | scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.tar.gz scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.tar.bz2 scummvm-rg350-c0e2f1c6f8f7df66ae6c090f6c16aea14ebe8bf3.zip | |
TOON: Updated code to build properly for WINSCW and GCCE(symbian)
Added templates to MAX & MIN functions. Correct usage of OpcodeV2(instead of Opcode)
Match implementation with function definition. (int32 is not == int on all platforms)
svn-id: r53401
Diffstat (limited to 'engines/toon/audio.cpp')
| -rw-r--r-- | engines/toon/audio.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp index 496d626201..2ae2b2cc31 100644 --- a/engines/toon/audio.cpp +++ b/engines/toon/audio.cpp @@ -128,7 +128,7 @@ void AudioManager::playVoice(int32 id, bool genericVoice) { } -void AudioManager::playSFX(int32 id, int32 volume , bool genericSFX) { +void AudioManager::playSFX(int32 id, int volume , bool genericSFX) { debugC(4, kDebugAudio, "playSFX(%d, %d)", id, (genericSFX) ? 1 : 0); // find a free SFX channel @@ -218,7 +218,7 @@ AudioStreamInstance::AudioStreamInstance(AudioManager *man, Audio::Mixer *mixer, } } -int32 AudioStreamInstance::readBuffer(int16 *buffer, const int numSamples) { +int AudioStreamInstance::readBuffer(int16 *buffer, const int numSamples) { debugC(5, kDebugAudio, "readBuffer(buffer, %d)", numSamples); handleFade(numSamples); @@ -353,7 +353,7 @@ void AudioStreamInstance::play(bool fade, Audio::Mixer::SoundType soundType) { handleFade(0); } -void AudioStreamInstance::handleFade(int numSamples) { +void AudioStreamInstance::handleFade(int32 numSamples) { debugC(5, kDebugAudio, "handleFade(%d)", numSamples); // Fading enabled only for music |