[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse.cpp,1.119,1.120 dimuse.h,1.69,1.70

Max Horn fingolfin at users.sourceforge.net
Fri Jan 28 15:53:50 CET 2005


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

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

Index: dimuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.cpp,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- dimuse.cpp	28 Jan 2005 11:51:57 -0000	1.119
+++ dimuse.cpp	28 Jan 2005 22:05:45 -0000	1.120
@@ -44,7 +44,6 @@
 
 IMuseDigital::IMuseDigital(ScummEngine *scumm, int fps)
 	: _vm(scumm) {
-	_mutex = g_system->createMutex();
 	_pause = false;
 	_sound = new ImuseDigiSndMgr(_vm);
 	_callbackFps = fps;
@@ -64,7 +63,6 @@
 		delete _track[l];
 	}
 	delete _sound;
-	g_system->deleteMutex(_mutex);
 }
 
 void IMuseDigital::resetState() {

Index: dimuse.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- dimuse.h	25 Jan 2005 22:20:56 -0000	1.69
+++ dimuse.h	28 Jan 2005 22:05:46 -0000	1.70
@@ -86,7 +86,7 @@
 
 	Track *_track[MAX_DIGITAL_TRACKS + MAX_DIGITAL_FADETRACKS];
 
-	Common::MutexRef _mutex;
+	Common::Mutex _mutex;
 	ScummEngine *_vm;
 	ImuseDigiSndMgr *_sound;
 





More information about the Scummvm-git-logs mailing list