[Scummvm-cvs-logs] CVS: scummvm/sword1 music.cpp,1.38,1.39 music.h,1.17,1.18 sword1.cpp,1.81,1.82

[Max Horn]

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

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

Index: music.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- music.cpp	13 Jan 2005 16:28:20 -0000	1.38
+++ music.cpp	28 Jan 2005 22:05:50 -0000	1.39
@@ -251,11 +251,9 @@
 	_looping = false;
 }
 
-Music::Music(OSystem *system, SoundMixer *pMixer) {
-	_system = system;
+Music::Music(SoundMixer *pMixer) {
 	_mixer = pMixer;
 	_sampleRate = pMixer->getOutputRate();
-	_mutex = _system->createMutex();
 	_converter[0] = NULL;
 	_converter[1] = NULL;
 	_volumeL = _volumeR = 192;
@@ -266,8 +264,6 @@
 	_mixer->setupPremix(0);
 	delete _converter[0];
 	delete _converter[1];
-	if (_mutex)
-		_system->deleteMutex(_mutex);
 }
 
 void Music::mixer(int16 *buf, uint32 len) {

Index: music.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/music.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- music.h	15 Jan 2005 21:44:26 -0000	1.17
+++ music.h	28 Jan 2005 22:05:50 -0000	1.18
@@ -84,7 +84,7 @@
 
 class Music : public AudioStream {
 public:
-	Music(OSystem *system, SoundMixer *pMixer);
+	Music(SoundMixer *pMixer);
 	~Music();
 	void startMusic(int32 tuneId, int32 loopFlag);
 	void fadeDown();
@@ -104,10 +104,9 @@
 	st_volume_t _volumeL, _volumeR;
 	MusicHandle _handles[2];
 	RateConverter *_converter[2];
-	OSystem *_system;
 	SoundMixer *_mixer;
 	uint32 _sampleRate;
-	Common::MutexRef _mutex;
+	Common::Mutex _mutex;
 
 	static void passMixerFunc(void *param, int16 *buf, uint len);
 	void mixer(int16 *buf, uint32 len);

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- sword1.cpp	10 Jan 2005 22:06:21 -0000	1.81
+++ sword1.cpp	28 Jan 2005 22:05:50 -0000	1.82
@@ -170,7 +170,7 @@
 	_mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume);
 	_mouse = new Mouse(_system, _resMan, _objectMan);
 	_screen = new Screen(_system, _resMan, _objectMan);
-	_music = new Music(_system, _mixer);
+	_music = new Music(_mixer);
 	_sound = new Sound("", _mixer, _resMan);
 	_menu = new Menu(_screen, _mouse);
 	_logic = new Logic(_objectMan, _resMan, _screen, _mouse, _sound, _music, _menu, _system, _mixer);