libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-12 03:56:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: RT: Initial support for multiple sound effects

Browse Source 
The paper boy in the intro sounds correct now
This commit is contained in:
Filippos Karapetis 2015-06-14 13:34:37 +03:00
parent a7e73e5785
commit 9e1ae6d82a
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
engines/sherlock/sound.cpp
View File

@ -192,7 +192,9 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
audioStream = Audio::makeAIFFStream(stream, DisposeAfterUse::YES);
}
_mixer->playStream(Audio::Mixer::kPlainSoundType, &_effectsHandle, audioStream, -1, Audio::Mixer::kMaxChannelVolume);
Audio::SoundHandle effectsHandle = (IS_SERRATED_SCALPEL) ? _scalpelEffectsHandle : getFreeSoundHandle();
_mixer->playStream(Audio::Mixer::kPlainSoundType, &effectsHandle, audioStream, -1, Audio::Mixer::kMaxChannelVolume);
_soundPlaying = true;
_curPriority = priority;
@ -209,22 +211,23 @@ bool Sound::playSound(const Common::String &name, WaitType waitType, int priorit
retval = false;
break;
}
} while (!_vm->shouldQuit() && _mixer->isSoundHandleActive(_effectsHandle));
} while (!_vm->shouldQuit() && _mixer->isSoundHandleActive(effectsHandle));
_soundPlaying = false;
_mixer->stopHandle(_effectsHandle);
_mixer->stopHandle(effectsHandle);
return retval;
}
void Sound::playLoadedSound(int bufNum, WaitType waitType) {
if (_mixer->isSoundHandleActive(_effectsHandle) && (_curPriority > _vm->_scene->_sounds[bufNum]._priority))
return;
if (IS_SERRATED_SCALPEL) {
if (_mixer->isSoundHandleActive(_scalpelEffectsHandle) && (_curPriority > _vm->_scene->_sounds[bufNum]._priority))
return;
stopSound();
}
stopSound();
playSound(_vm->_scene->_sounds[bufNum]._name, waitType, _vm->_scene->_sounds[bufNum]._priority);
return;
}
void Sound::freeLoadedSounds() {
@ -234,7 +237,12 @@ void Sound::freeLoadedSounds() {
}
void Sound::stopSound() {
_mixer->stopHandle(_effectsHandle);
if (IS_SERRATED_SCALPEL) {
_mixer->stopHandle(_scalpelEffectsHandle);
} else {
for (int i = 0; i < MAX_MIXER_CHANNELS; i++)
_mixer->stopHandle(_tattooEffectsHandle[i]);
}
}
void Sound::stopSndFuncPtr(int v1, int v2) {
@ -249,5 +257,14 @@ void Sound::freeDigiSound() {
_soundPlaying = false;
}
Audio::SoundHandle Sound::getFreeSoundHandle() {
for (int i = 0; i < MAX_MIXER_CHANNELS; i++) {
if (!_mixer->isSoundHandleActive(_tattooEffectsHandle[i]))
return _tattooEffectsHandle[i];
}
error("getFreeSoundHandle: No sound handle found");
}
} // End of namespace Sherlock

7
engines/sherlock/sound.h
View File

@ -39,11 +39,14 @@ enum WaitType {
WAIT_RETURN_IMMEDIATELY = 0, WAIT_FINISH = 1, WAIT_KBD_OR_FINISH = 2
};
#define MAX_MIXER_CHANNELS 10
class Sound {
private:
SherlockEngine *_vm;
Audio::Mixer *_mixer;
Audio::SoundHandle _effectsHandle;
Audio::SoundHandle _scalpelEffectsHandle;
Audio::SoundHandle _tattooEffectsHandle[MAX_MIXER_CHANNELS];
int _curPriority;
byte decodeSample(byte sample, byte& reference, int16& scale);
@ -93,6 +96,8 @@ public:
void stopSndFuncPtr(int v1, int v2);
void freeDigiSound();
Audio::SoundHandle getFreeSoundHandle();
};
} // End of namespace Sherlock