[Scummvm-cvs-logs] CVS: scummvm/sound mixer.h,1.27,1.28 mpu401.h,1.11,1.12

Max Horn fingolfin at users.sourceforge.net
Sat Jul 5 08:20:07 CEST 2003


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

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

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mixer.h	22 Jun 2003 11:46:58 -0000	1.27
+++ mixer.h	5 Jul 2003 15:19:11 -0000	1.28
@@ -54,7 +54,7 @@
 	static void onGenerateSamples(void *s, byte *samples, int len);
 
 	OSystem *_syst;
-	void *_mutex;
+	OSystem::MutexRef _mutex;
 
 	void *_premixParam;
 	PremixProc *_premixProc;

Index: mpu401.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mpu401.h	11 Jun 2003 07:14:39 -0000	1.11
+++ mpu401.h	5 Jul 2003 15:19:11 -0000	1.12
@@ -22,6 +22,7 @@
 #ifndef SOUND_MPU401_H
 #define SOUND_MPU401_H
 
+#include "common/system.h"
 #include "mididrv.h"
 
 ////////////////////////////////////////
@@ -79,7 +80,7 @@
 
 	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;
 





More information about the Scummvm-git-logs mailing list