libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-05-13 09:36:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make the midi player threadsafe (this should fix bug #1506583 "KYRA1: Crash on exceeded polyphony").

Browse Source 
svn-id: r23605
This commit is contained in:
Johannes Schickel 2006-07-26 22:24:33 +00:00
parent eb7cda50aa
commit bcc892ec81
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
engines/kyra/sound.cpp
View File

@ -118,6 +118,11 @@ SoundMidiPC::SoundMidiPC(MidiDriver *driver, Audio::Mixer *mixer, KyraEngine *en
}
SoundMidiPC::~SoundMidiPC() {
stopMusic();
stopSoundEffect();
Common::StackLock lock(_mutex);
_driver->setTimerCallback(NULL, NULL);
close();
}
@ -243,6 +248,8 @@ void SoundMidiPC::loadMusicFile(const char *file) {
void SoundMidiPC::playMusic(uint8 *data, uint32 size) {
stopMusic();
Common::StackLock lock(_mutex);
_parserSource = data;
_parser = MidiParser::createParser_XMIDI();
assert(_parser);
@ -278,6 +285,8 @@ void SoundMidiPC::loadSoundEffectFile(const char *file) {
void SoundMidiPC::loadSoundEffectFile(uint8 *data, uint32 size) {
stopSoundEffect();
Common::StackLock lock(_mutex);
_soundEffectSource = data;
_soundEffect = MidiParser::createParser_XMIDI();
assert(_soundEffect);
@ -296,6 +305,8 @@ void SoundMidiPC::loadSoundEffectFile(uint8 *data, uint32 size) {
}
void SoundMidiPC::stopMusic() {
Common::StackLock lock(_mutex);
_isPlaying = false;
if (_parser) {
_parser->unloadMusic();
@ -311,6 +322,8 @@ void SoundMidiPC::stopMusic() {
}
void SoundMidiPC::stopSoundEffect() {
Common::StackLock lock(_mutex);
_sfxIsPlaying = false;
if (_soundEffect) {
_soundEffect->unloadMusic();
@ -323,6 +336,7 @@ void SoundMidiPC::stopSoundEffect() {
void SoundMidiPC::onTimer(void *refCon) {
SoundMidiPC *music = (SoundMidiPC *)refCon;
Common::StackLock lock(music->_mutex);
// this should be set to the fadeToBlack value
static const uint32 musicFadeTime = 2 * 1000;

5
engines/kyra/sound.h
View File

@ -26,9 +26,12 @@
#include "common/stdafx.h"
#include "common/scummsys.h"
#include "common/file.h"
#include "common/mutex.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"
#include "sound/mixer.h"
#include "kyra/kyra.h"
namespace Audio {
@ -200,6 +203,8 @@ private:
byte *_parserSource;
MidiParser *_soundEffect;
byte *_soundEffectSource;
Common::Mutex _mutex;
};
class MixedSoundDriver : public Sound {