libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-22 18:37:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wrapped access to the playing sounds list in a mutex

Browse Source 
svn-id: r29114
This commit is contained in:
Paul Gilbert 2007-09-28 07:55:02 +00:00
parent 61a642b1cc
commit c5edcaa2ef
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
engines/lure/sound.cpp
View File

@ -36,6 +36,8 @@ DECLARE_SINGLETON(Lure::SoundManager);
namespace Lure {
SoundManager::SoundManager() {
_soundMutex = g_system->createMutex();
int index;
_descs = Disk::getReference().getEntry(SOUND_DESC_RESOURCE_ID);
_numDescs = _descs->size() / sizeof(SoundDescResource);
@ -69,8 +71,10 @@ SoundManager::~SoundManager() {
removeSounds();
_activeSounds.clear();
_playingSounds.clear();
g_system->lockMutex(_soundMutex);
_playingSounds.clear();
g_system->unlockMutex(_soundMutex);
delete _descs;
if (_soundData)
@ -79,6 +83,8 @@ SoundManager::~SoundManager() {
if (_driver)
_driver->close();
_driver = NULL;
g_system->deleteMutex(_soundMutex);
}
void SoundManager::loadSection(uint16 sectionId) {
@ -370,9 +376,11 @@ void SoundManager::musicInterface_Play(uint8 soundNumber, uint8 channelNumber) {
dataSize = nextDataOfs - dataOfs;
}
g_system->lockMutex(_soundMutex);
MidiMusic *sound = new MidiMusic(_driver, _channelsInner, channelNumber, soundNumber,
soundStart, dataSize);
_playingSounds.push_back(sound);
g_system->unlockMutex(_soundMutex);
}
// musicInterface_Stop
@ -383,14 +391,16 @@ void SoundManager::musicInterface_Stop(uint8 soundNumber) {
musicInterface_TidySounds();
uint8 soundNum = soundNumber & 0x7f;
g_system->lockMutex(_soundMutex);
ManagedList<MidiMusic *>::iterator i;
for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
MidiMusic *music = *i;
if (music->soundNumber() == soundNum) {
_playingSounds.erase(i);
return;
break;
}
}
g_system->unlockMutex(_soundMutex);
}
// musicInterface_CheckPlaying
@ -434,6 +444,7 @@ void SoundManager::musicInterface_KillAll() {
debugC(ERROR_INTERMEDIATE, kLureDebugSounds, "musicInterface_KillAll");
musicInterface_TidySounds();
g_system->lockMutex(_soundMutex);
ManagedList<MidiMusic *>::iterator i;
for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
MidiMusic *music = *i;
@ -442,6 +453,7 @@ void SoundManager::musicInterface_KillAll() {
_playingSounds.clear();
_activeSounds.clear();
g_system->unlockMutex(_soundMutex);
}
// musicInterface_ContinuePlaying
@ -464,6 +476,8 @@ void SoundManager::musicInterface_TrashReverb() {
void SoundManager::musicInterface_TidySounds() {
debugC(ERROR_DETAILED, kLureDebugSounds, "musicInterface_TidySounds");
g_system->lockMutex(_soundMutex);
ManagedList<MidiMusic *>::iterator i = _playingSounds.begin();
while (i != _playingSounds.end()) {
MidiMusic *music = *i;
@ -472,17 +486,25 @@ void SoundManager::musicInterface_TidySounds() {
else
++i;
}
g_system->unlockMutex(_soundMutex);
}
void SoundManager::onTimer(void *data) {
SoundManager *snd = (SoundManager *) data;
snd->doTimer();
}
void SoundManager::doTimer() {
g_system->lockMutex(_soundMutex);
ManagedList<MidiMusic *>::iterator i;
for (i = snd->_playingSounds.begin(); i != snd->_playingSounds.end(); ++i) {
for (i = _playingSounds.begin(); i != _playingSounds.end(); ++i) {
MidiMusic *music = *i;
if (music->isPlaying())
music->onTimer();
}
g_system->unlockMutex(_soundMutex);
}
/*------------------------------------------------------------------------*/

2
engines/lure/sound.h
View File

@ -117,11 +117,13 @@ private:
bool _channelsInUse[NUM_CHANNELS_OUTER];
bool _isPlaying;
bool _nativeMT32;
Common::MutexRef _soundMutex;
// Internal support methods
void bellsBodge();
void musicInterface_TidySounds();
static void onTimer(void *data);
void doTimer();
public:
SoundManager();
~SoundManager();