Added a mutex to the Groovie MIDI player. Maybe that will fix the rare and

unpredictable crashes I've been seeing.

svn-id: r35116

2 files changed, 38 insertions, 3 deletions

diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 1a7f6a4207..0422734f43 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -37,7 +37,7 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) :
 	// Create the driver
 	int driver = detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
 	_driver = createMidi(driver);
-	_driver->open();
+	this->open();
 
 	// Initialize the channel volumes
 	for (int i = 0; i < 0x10; i++) {
@@ -52,6 +52,10 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) :
 }
 
 MusicPlayer::~MusicPlayer() {
+	_driver->setTimerCallback(NULL, NULL);
+
+	Common::StackLock lock(_mutex);
+
 	// Unload the parser
 	unload();
 	delete _midiParser;
@@ -62,18 +66,25 @@ MusicPlayer::~MusicPlayer() {
 }
 
 void MusicPlayer::playSong(uint16 fileref) {
+	Common::StackLock lock(_mutex);
+
 	// Play the referenced file once
 	play(fileref, false);
 }
 
 void MusicPlayer::setBackgroundSong(uint16 fileref) {
+	Common::StackLock lock(_mutex);
+
 	_backgroundFileRef = fileref;
 }
 
 void MusicPlayer::setUserVolume(uint16 volume) {
+	Common::StackLock lock(_mutex);
+
 	// Save the new user volume
 	_userVolume = volume;
-	if (_userVolume > 0x100) _userVolume = 0x100;
+	if (_userVolume > 0x100)
+		_userVolume = 0x100;
 
 	// Apply it to all the channels
 	for (int i = 0; i < 0x10; i++) {
@@ -84,12 +95,15 @@ void MusicPlayer::setUserVolume(uint16 volume) {
 }
 
 void MusicPlayer::setGameVolume(uint16 volume, uint16 time) {
+	Common::StackLock lock(_mutex);
+
 	//TODO: Implement volume fading
 	debugC(5, kGroovieDebugMIDI | kGroovieDebugAll, "setting game volume: %d, %d\n", volume, time);
 
 	// Save the new game volume
 	_gameVolume = volume;
-	if (_gameVolume > 100) _gameVolume = 100;
+	if (_gameVolume > 100)
+		_gameVolume = 100;
 
 	// Apply it to all the channels
 	for (int i = 0; i < 0x10; i++) {
@@ -159,6 +173,15 @@ void MusicPlayer::unload() {
 }
 
 int MusicPlayer::open() {
+	// Don't ever call open without first setting the output driver!
+	if (!_driver)
+		return 255;
+
+	int ret = _driver->open();
+	if (ret)
+		return ret;
+
+	_driver->setTimerCallback(this, &onTimer);
 	return 0;
 }
 
@@ -192,6 +215,14 @@ void MusicPlayer::metaEvent(byte type, byte *data, uint16 length) {
 	}
 }
 
+void MusicPlayer::onTimer(void *refCon) {
+	MusicPlayer *music = (MusicPlayer *)refCon;
+	Common::StackLock lock(music->_mutex);
+
+	// TODO: We really only need to call this while music is playing.
+	music->_midiParser->onTimer();
+}
+
 void MusicPlayer::setTimerCallback(void *timer_param, Common::TimerManager::TimerProc timer_proc) {
 	_driver->setTimerCallback(timer_param, timer_proc);
 }
diff --git a/engines/groovie/music.h b/engines/groovie/music.h
index 6c8e6490b5..f5e9461fbb 100644
--- a/engines/groovie/music.h
+++ b/engines/groovie/music.h
@@ -30,6 +30,7 @@
 
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
+#include "common/mutex.h"
 
 namespace Groovie {
 
@@ -62,12 +63,15 @@ public:
 
 private:
 	GroovieEngine *_vm;
+	Common::Mutex _mutex;
 	byte *_data;
 	MidiParser *_midiParser;
 	MidiDriver *_driver;
 
 	uint16 _backgroundFileRef;
 
+	static void onTimer(void *data);
+
 	bool play(uint16 fileref, bool loop);
 	bool load(uint16 fileref);
 	void unload();