[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.38,1.39

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv6715/scummvm/simon

Modified Files:
	midi.cpp 
Log Message:
Fixed problem with Simon music playing even when paused.

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- midi.cpp	22 May 2003 00:06:24 -0000	1.38
+++ midi.cpp	23 May 2003 15:14:44 -0000	1.39
@@ -127,7 +127,7 @@
 void MidiPlayer::onTimer (void *data) {
 	MidiPlayer *player = (MidiPlayer *) data;
 	player->_system->lock_mutex (player->_mutex);
-	if (!player->_paused && player->_parser)
+	if (!player->_paused && player->_parser && player->_currentTrack != 255)
 		player->_parser->onTimer();
 	player->_system->unlock_mutex (player->_mutex);
 }
@@ -170,11 +170,9 @@
 	}
 
 	_system->unlock_mutex (_mutex);
-	pause (false);
 }
 
 void MidiPlayer::stop() {
-	pause (true);
 	_system->lock_mutex (_mutex);
 	_currentTrack = 255;
 	_system->unlock_mutex (_mutex);
@@ -294,7 +292,6 @@
 		parser = 0;
 	}
 
-	_paused = true;
 	_currentTrack = 255;
 	memset(_volumeTable, 127, sizeof(_volumeTable));
 	_parser = parser; // That plugs the power cord into the wall
@@ -350,7 +347,6 @@
 		_song_sizes[i] = size;
 	}
 
-	_paused = true;
 	_currentTrack = 255;
 	memset(_volumeTable, 127, sizeof(_volumeTable));
 	_system->unlock_mutex (_mutex);
@@ -397,7 +393,6 @@
 		parser = 0;
 	}
 
-	_paused = true;
 	_currentTrack = 255;
 	memset(_volumeTable, 127, sizeof(_volumeTable));
 	_parser = parser; // That plugs the power cord into the wall