[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.h,1.34,1.35 player_v2.h,2.6,2.7

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv22270/scumm

Modified Files:
	imuse.h player_v2.h 
Log Message:
updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*)

Index: imuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- imuse.h	15 Jun 2003 01:42:15 -0000	1.34
+++ imuse.h	5 Jul 2003 15:19:11 -0000	1.35
@@ -24,6 +24,7 @@
 #define IMUSE_H
 
 #include "scummsys.h"
+#include "common/system.h"
 
 class IMuseInternal;
 class MidiDriver;
@@ -36,7 +37,7 @@
 private:
 	OSystem *_system;
 	IMuseInternal *_target;
-	void *_mutex;
+	OSystem::MutexRef _mutex;
 
 	IMuse (OSystem *system, IMuseInternal *target);
 	void in();

Index: player_v2.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_v2.h,v
retrieving revision 2.6
retrieving revision 2.7
diff -u -d -r2.6 -r2.7
--- player_v2.h	27 Jun 2003 00:10:17 -0000	2.6
+++ player_v2.h	5 Jul 2003 15:19:11 -0000	2.7
@@ -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 @@
 	byte *next_data;
 	byte *retaddr;
 
-	void *_mutex;
+	OSystem::MutexRef _mutex;
 	void mutex_up() { _system->lock_mutex (_mutex); }
 	void mutex_down() { _system->unlock_mutex (_mutex); }