aboutsummaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorMatthew Hoops2013-07-06 23:54:45 -0400
committerMatthew Hoops2013-07-06 23:54:45 -0400
commit4a7e4e5b22da3587a9d68978d7be31e4e78a8ccc (patch)
tree99da5697f89e53aef119dc1e49d2df9a96c0eae9 /audio
parentbd82ca97c228edb1f526a8a88a9f370daab8de95 (diff)
downloadscummvm-rg350-4a7e4e5b22da3587a9d68978d7be31e4e78a8ccc.tar.gz
scummvm-rg350-4a7e4e5b22da3587a9d68978d7be31e4e78a8ccc.tar.bz2
scummvm-rg350-4a7e4e5b22da3587a9d68978d7be31e4e78a8ccc.zip
ALL: Don't use EventRecorder at all when not compiled in
Diffstat (limited to 'audio')
-rw-r--r--audio/mixer.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/audio/mixer.cpp b/audio/mixer.cpp
index ab3ed9eb2d..9e6e4596e2 100644
--- a/audio/mixer.cpp
+++ b/audio/mixer.cpp
@@ -429,7 +429,11 @@ void MixerImpl::pauseHandle(SoundHandle handle, bool paused) {
bool MixerImpl::isSoundIDActive(int id) {
Common::StackLock lock(_mutex);
+
+#ifdef ENABLE_EVENTRECORDER
g_eventRec.updateSubsystems();
+#endif
+
for (int i = 0; i != NUM_CHANNELS; i++)
if (_channels[i] && _channels[i]->getId() == id)
return true;
@@ -446,7 +450,11 @@ int MixerImpl::getSoundID(SoundHandle handle) {
bool MixerImpl::isSoundHandleActive(SoundHandle handle) {
Common::StackLock lock(_mutex);
+
+#ifdef ENABLE_EVENTRECORDER
g_eventRec.updateSubsystems();
+#endif
+
const int index = handle._val % NUM_CHANNELS;
return _channels[index] && _channels[index]->getHandle()._val == handle._val;
}