aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.cpp
diff options
context:
space:
mode:
authorMax Horn2003-07-06 17:00:09 +0000
committerMax Horn2003-07-06 17:00:09 +0000
commit7e4fa4a1da468343fc5d5b9e2b62257611920cb2 (patch)
treedb7c9f10aacb76a6dc42fdabd30ba523929ffb26 /sound/mixer.cpp
parentb6c3d440b57aa792c5464babe0bb7ad4eb9b5f2c (diff)
downloadscummvm-rg350-7e4fa4a1da468343fc5d5b9e2b62257611920cb2.tar.gz
scummvm-rg350-7e4fa4a1da468343fc5d5b9e2b62257611920cb2.tar.bz2
scummvm-rg350-7e4fa4a1da468343fc5d5b9e2b62257611920cb2.zip
mix() is really a private method, only to be called by the audio thread; cover setupPremix by the mutex, too (that helps preventing race conditions upon exit)
svn-id: r8809
Diffstat (limited to 'sound/mixer.cpp')
-rw-r--r--sound/mixer.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 666f31e1a7..6be55b866d 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -356,6 +356,7 @@ bool SoundMixer::isActiveChannel(int index) {
}
void SoundMixer::setupPremix(void *param, PremixProc *proc) {
+ StackLock lock(_mutex);
_premixParam = param;
_premixProc = proc;
}