[Scummvm-cvs-logs] CVS: residual/mixer mixer.cpp,1.1,1.2 mixer.h,1.1,1.2

Pawel Kolodziejski aquadran at users.sourceforge.net
Fri Dec 12 13:39:00 CET 2003


Update of /cvsroot/scummvm/residual/mixer
In directory sc8-pr-cvs1:/tmp/cvs-serv17288/mixer

Modified Files:
	mixer.cpp mixer.h 
Log Message:
added timer code

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/mixer.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mixer.cpp	12 Dec 2003 21:17:31 -0000	1.1
+++ mixer.cpp	12 Dec 2003 21:38:10 -0000	1.2
@@ -25,31 +25,6 @@
 
 SoundMixer *g_mixer = NULL;
 
-StackLock::StackLock(MutexRef mutex)
-	: _mutex(mutex) {
-	lock_mutex(_mutex);
-}
-
-StackLock::~StackLock() {
-	unlock_mutex(_mutex);
-}
-
-MutexRef create_mutex() {
-	return (MutexRef) SDL_CreateMutex();
-}
-
-void lock_mutex(MutexRef mutex) {
-	SDL_mutexP((SDL_mutex *) mutex);
-}
-
-void unlock_mutex(MutexRef mutex) {
-	SDL_mutexV((SDL_mutex *) mutex);
-}
-
-void delete_mutex(MutexRef mutex) {
-	SDL_DestroyMutex((SDL_mutex *) mutex);
-}
-
 /**
  * Channels used by the sound mixer.
  */

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/residual/mixer/mixer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mixer.h	12 Dec 2003 21:17:31 -0000	1.1
+++ mixer.h	12 Dec 2003 21:38:12 -0000	1.2
@@ -23,21 +23,7 @@
 #include <SDL.h>
 
 typedef uint32 PlayingSoundHandle;
-typedef struct Mutex *MutexRef;
 typedef void (*SoundProc)(void *param, byte *buf, int len);
-typedef int (*TimerProc)(int interval);
-
-class StackLock {
-	MutexRef _mutex;
-public:
-	StackLock(MutexRef mutex);
-	~StackLock();
-};
-
-MutexRef create_mutex();
-void lock_mutex(MutexRef mutex);
-void unlock_mutex(MutexRef mutex);
-void delete_mutex(MutexRef mutex);
 
 class Channel;
 





More information about the Scummvm-git-logs mailing list