[Scummvm-cvs-logs] CVS: scummvm/sword2 sound.cpp,1.51,1.52 sound.h,1.12,1.13

[Max Horn]

Update of /cvsroot/scummvm/scummvm/sword2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5365/sword2

Modified Files:
	sound.cpp sound.h 
Log Message:
Use class Mutex instead of MutexRef

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sound.cpp	28 Jan 2005 16:33:11 -0000	1.51
+++ sound.cpp	28 Jan 2005 22:05:51 -0000	1.52
@@ -46,7 +46,6 @@
 	int i;
 
 	_vm = vm;
-	_mutex = _vm->_system->createMutex();
 
 	for (i = 0; i < FXQ_LENGTH; i++)
 		_fxQueue[i].resource = 0;
@@ -79,9 +78,6 @@
 		delete _music[i];
 
 	free(_mixBuffer);
-
-	if (_mutex)
-		_vm->_system->deleteMutex(_mutex);
 }
 
 /**

Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sound.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sound.h	28 Jan 2005 16:33:11 -0000	1.12
+++ sound.h	28 Jan 2005 22:05:51 -0000	1.13
@@ -62,8 +62,6 @@
 	FX_LOOPING	= 4
 };
 
-extern void sword2_sound_handler(void *refCon);
-
 class CLUInputStream : public AudioStream {
 private:
 	File *_file;
@@ -142,7 +140,7 @@
 private:
 	Sword2Engine *_vm;
 
-	Common::MutexRef _mutex;
+	Common::Mutex _mutex;
 
 	struct FxQueueEntry {
 		PlayingSoundHandle handle;	// sound handle