From d098334fe651616afa8b5314bcf580ae835185b2 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 5 Jul 2003 15:19:11 +0000 Subject: updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*) svn-id: r8777 --- scumm/imuse.h | 3 ++- scumm/player_v2.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'scumm') diff --git a/scumm/imuse.h b/scumm/imuse.h index 7c9033c940..ff3d809101 100644 --- a/scumm/imuse.h +++ b/scumm/imuse.h @@ -24,6 +24,7 @@ #define IMUSE_H #include "scummsys.h" +#include "common/system.h" class IMuseInternal; class MidiDriver; @@ -36,7 +37,7 @@ class IMuse { private: OSystem *_system; IMuseInternal *_target; - void *_mutex; + OSystem::MutexRef _mutex; IMuse (OSystem *system, IMuseInternal *target); void in(); diff --git a/scumm/player_v2.h b/scumm/player_v2.h index 7680754c82..1bdfa96382 100644 --- a/scumm/player_v2.h +++ b/scumm/player_v2.h @@ -24,6 +24,7 @@ #define PLAYER_V2_H #include "common/scummsys.h" +#include "common/system.h" #if !defined(__GNUC__) #pragma START_PACK_STRUCTS @@ -116,7 +117,7 @@ private: byte *next_data; byte *retaddr; - void *_mutex; + OSystem::MutexRef _mutex; void mutex_up() { _system->lock_mutex (_mutex); } void mutex_down() { _system->unlock_mutex (_mutex); } -- cgit v1.2.3