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

CGE2: Rename _soundHandle to _sfxHandle.

Browse Source
This commit is contained in:
uruk 2014-08-13 20:35:31 +02:00
parent 28a450982a
commit c247125469
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/cge2/sound.cpp
View File

@ -93,7 +93,7 @@ void Sound::sndDigiStart(SmpInfo *PSmpInfo, Audio::Mixer::SoundType soundType) {
Audio::SoundHandle *handle = nullptr;
switch (soundType) {
case Audio::Mixer::kSFXSoundType:
handle = &_soundHandle;
handle = &_sfxHandle;
break;
case Audio::Mixer::kSpeechSoundType:
handle = &_speechHandle;
@ -114,13 +114,13 @@ void Sound::sndDigiStart(SmpInfo *PSmpInfo, Audio::Mixer::SoundType soundType) {
}
void Sound::stop() {
sndDigiStop(_soundHandle);
sndDigiStop(_sfxHandle);
sndDigiStop(_speechHandle);
_audioStream = nullptr;
}
void Sound::checkSoundHandles() {
if (!_vm->_mixer->isSoundHandleActive(_speechHandle) && !_vm->_mixer->isSoundHandleActive(_soundHandle))
if (!_vm->_mixer->isSoundHandleActive(_speechHandle) && !_vm->_mixer->isSoundHandleActive(_sfxHandle))
_smpinf._counter = 0;
}

2
engines/cge2/sound.h
View File

@ -80,7 +80,7 @@ public:
private:
int _soundRepeatCount;
CGE2Engine *_vm;
Audio::SoundHandle _soundHandle;
Audio::SoundHandle _sfxHandle;
Audio::SoundHandle _speechHandle;
Audio::RewindableAudioStream *_audioStream;