aboutsummaryrefslogtreecommitdiff
path: root/sound/softsynth
diff options
context:
space:
mode:
authorFlorian Kagerer2010-10-08 16:31:08 +0000
committerFlorian Kagerer2010-10-08 16:31:08 +0000
commitb58bbd719cad79445f496828f1a49465481826ee (patch)
tree31f53331361f3270d2402f24bb172dd19e773c82 /sound/softsynth
parent4ad65e5179c4ad5bf71d2bba3eaaeebf9fcef211 (diff)
downloadscummvm-rg350-b58bbd719cad79445f496828f1a49465481826ee.tar.gz
scummvm-rg350-b58bbd719cad79445f496828f1a49465481826ee.tar.bz2
scummvm-rg350-b58bbd719cad79445f496828f1a49465481826ee.zip
SCUMM/FM-TOWNS: fixed threading issue in sfx code
svn-id: r53074
Diffstat (limited to 'sound/softsynth')
-rw-r--r--sound/softsynth/fmtowns_pc98/towns_audio.cpp1
-rw-r--r--sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp1
-rw-r--r--sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp1
3 files changed, 1 insertions, 2 deletions
diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
index 58e09f291b..f9c9529214 100644
--- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -226,7 +226,6 @@ TownsAudioInterface::TownsAudioInterface(Audio::Mixer *mixer, TownsAudioInterfac
}
TownsAudioInterface::~TownsAudioInterface() {
- Common::StackLock lock(_mutex);
reset();
deinit();
_ready = false;
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
index 3cf4caf0d1..b711eccbe1 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
@@ -1053,7 +1053,6 @@ TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type)
}
TownsPC98_AudioDriver::~TownsPC98_AudioDriver() {
- Common::StackLock lock(_mutex);
reset();
deinit();
_ready = false;
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index 0a4984888d..dbd8e37cb7 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -907,6 +907,7 @@ bool TownsPC98_FmSynth::init() {
}
void TownsPC98_FmSynth::reset() {
+ Common::StackLock lock(_mutex);
for (int i = 0; i < _numChan; i++) {
for (int ii = 0; ii < 4; ii++)
_chanInternal[i].opr[ii]->reset();