aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMax Horn2003-07-05 15:19:11 +0000
committerMax Horn2003-07-05 15:19:11 +0000
commitd098334fe651616afa8b5314bcf580ae835185b2 (patch)
tree5442e167b6a58dea66f8482a1afcae264dfbbc1a /sound
parent4611b12c0a84ec528f9f020dc85bf4e9a0108c82 (diff)
downloadscummvm-rg350-d098334fe651616afa8b5314bcf580ae835185b2.tar.gz
scummvm-rg350-d098334fe651616afa8b5314bcf580ae835185b2.tar.bz2
scummvm-rg350-d098334fe651616afa8b5314bcf580ae835185b2.zip
updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*)
svn-id: r8777
Diffstat (limited to 'sound')
-rw-r--r--sound/mixer.h2
-rw-r--r--sound/mpu401.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/sound/mixer.h b/sound/mixer.h
index 16e94f3326..cc281c0458 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -54,7 +54,7 @@ private:
static void onGenerateSamples(void *s, byte *samples, int len);
OSystem *_syst;
- void *_mutex;
+ OSystem::MutexRef _mutex;
void *_premixParam;
PremixProc *_premixProc;
diff --git a/sound/mpu401.h b/sound/mpu401.h
index 592ca67a20..f1d7dc8d2a 100644
--- a/sound/mpu401.h
+++ b/sound/mpu401.h
@@ -22,6 +22,7 @@
#ifndef SOUND_MPU401_H
#define SOUND_MPU401_H
+#include "common/system.h"
#include "mididrv.h"
////////////////////////////////////////
@@ -79,7 +80,7 @@ private:
MidiChannel_MPU401 _midi_channels [16];
volatile bool _started_thread;
- void *_mutex; // Concurrent shutdown barrier
+ OSystem::MutexRef _mutex; // Concurrent shutdown barrier
volatile TimerCallback _timer_proc;
void *_timer_param;