[Scummvm-cvs-logs] SF.net SVN: scummvm: [28697] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28697
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28697&view=rev
Author:   thebluegr
Date:     2007-08-22 08:28:31 -0700 (Wed, 22 Aug 2007)

Log Message:
-----------
Mutexes are now used in the MIDI music playing code

Modified Paths:
--------------
    scummvm/trunk/engines/saga/music.cpp
    scummvm/trunk/engines/saga/music.h

Modified: scummvm/trunk/engines/saga/music.cpp
===================================================================
--- scummvm/trunk/engines/saga/music.cpp	2007-08-22 12:20:21 UTC (rev 28696)
+++ scummvm/trunk/engines/saga/music.cpp	2007-08-22 15:28:31 UTC (rev 28697)
@@ -320,6 +320,8 @@
 
 void MusicPlayer::onTimer(void *refCon) {
 	MusicPlayer *music = (MusicPlayer *)refCon;
+	Common::StackLock lock(music->_mutex);
+
 	if (music->_isPlaying)
 		music->_parser->onTimer();
 }
@@ -329,6 +331,8 @@
 }
 
 void MusicPlayer::stopMusic() {
+	Common::StackLock lock(_mutex);
+
 	_isPlaying = false;
 	if (_parser) {
 		_parser->unloadMusic();

Modified: scummvm/trunk/engines/saga/music.h
===================================================================
--- scummvm/trunk/engines/saga/music.h	2007-08-22 12:20:21 UTC (rev 28696)
+++ scummvm/trunk/engines/saga/music.h	2007-08-22 15:28:31 UTC (rev 28697)
@@ -34,6 +34,7 @@
 #include "sound/mp3.h"
 #include "sound/vorbis.h"
 #include "sound/flac.h"
+#include "common/mutex.h"
 
 namespace Saga {
 
@@ -77,6 +78,7 @@
 	MidiChannel *getPercussionChannel()	{ return 0; }
 
 	MidiParser *_parser;
+	Common::Mutex _mutex;
 
 protected:
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.