From 790b2e1e9a9b4b63fcf63b19428661d08fddd998 Mon Sep 17 00:00:00 2001
From: Jamieson Christian
Date: Fri, 23 May 2003 15:14:44 +0000
Subject: Fixed problem with Simon music playing even when paused.

svn-id: r7864
---
 simon/midi.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'simon')

diff --git a/simon/midi.cpp b/simon/midi.cpp
index c181511d40..f12aa4d191 100644
--- a/simon/midi.cpp
+++ b/simon/midi.cpp
@@ -127,7 +127,7 @@ void MidiPlayer::metaEvent (byte type, byte *data, uint16 length) {
 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 @@ void MidiPlayer::startTrack (int track) {
 	}
 
 	_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 @@ void MidiPlayer::loadSMF (File *in, int song) {
 		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 @@ void MidiPlayer::loadMultipleSMF (File *in) {
 		_song_sizes[i] = size;
 	}
 
-	_paused = true;
 	_currentTrack = 255;
 	memset(_volumeTable, 127, sizeof(_volumeTable));
 	_system->unlock_mutex (_mutex);
@@ -397,7 +393,6 @@ void MidiPlayer::loadXMIDI (File *in) {
 		parser = 0;
 	}
 
-	_paused = true;
 	_currentTrack = 255;
 	memset(_volumeTable, 127, sizeof(_volumeTable));
 	_parser = parser; // That plugs the power cord into the wall
-- 
cgit v1.2.3