[Scummvm-cvs-logs] CVS: scummvm/sound mixer.cpp,1.181,1.182 mixer.h,1.93,1.94

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


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

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

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- mixer.cpp	10 Jan 2005 22:06:19 -0000	1.181
+++ mixer.cpp	28 Jan 2005 22:05:49 -0000	1.182
@@ -102,7 +102,6 @@
 
 SoundMixer::SoundMixer() {
 	_syst = &OSystem::instance();
-	_mutex = _syst->createMutex();
 
 	_premixChannel = 0;
 	int i = 0;
@@ -130,8 +129,6 @@
 
 	delete _premixChannel;
 	_premixChannel = 0;
-
-	_syst->deleteMutex(_mutex);
 }
 
 bool SoundMixer::isPaused() {

Index: mixer.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- mixer.h	10 Jan 2005 22:06:19 -0000	1.93
+++ mixer.h	28 Jan 2005 22:05:49 -0000	1.94
@@ -89,7 +89,7 @@
 	};
 
 	OSystem *_syst;
-	Common::MutexRef _mutex;
+	Common::Mutex _mutex;
 
 	Channel *_premixChannel;
 





More information about the Scummvm-git-logs mailing list