[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.35,1.36 midi.h,1.13,1.14 simon.cpp,1.197,1.198

[Jamieson Christian]

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

Modified Files:
	midi.cpp midi.h simon.cpp 
Log Message:
Fixed Simon 1 sound effects.
More semantic fixes.

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- midi.cpp	21 May 2003 04:36:09 -0000	1.35
+++ midi.cpp	21 May 2003 05:26:28 -0000	1.36
@@ -263,7 +263,7 @@
 	17256, 5103, 8794, 4884, 16
 };
 
-void MidiPlayer::playSMF (File *in, int song) {
+void MidiPlayer::loadSMF (File *in, int song) {
 	_system->lock_mutex (_mutex);
 	clearConstructs();
 
@@ -298,7 +298,7 @@
 	_system->unlock_mutex (_mutex);
 }
 
-void MidiPlayer::playMultipleSMF (File *in) {
+void MidiPlayer::loadMultipleSMF (File *in) {
 	// This is a special case for Simon 2 Windows.
 	// Instead of having multiple sequences as
 	// separate tracks in a Type 2 file, simon2win
@@ -353,7 +353,7 @@
 //	jump (0, 1);
 }
 
-void MidiPlayer::playXMIDI (File *in) {
+void MidiPlayer::loadXMIDI (File *in) {
 	_system->lock_mutex (_mutex);
 	clearConstructs();
 

Index: midi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- midi.h	21 May 2003 04:36:09 -0000	1.13
+++ midi.h	21 May 2003 05:26:29 -0000	1.14
@@ -57,9 +57,9 @@
 	MidiPlayer (OSystem *system);
 	virtual ~MidiPlayer();
 
-	void playSMF (File *in, int song);
-	void playMultipleSMF (File *in);
-	void playXMIDI (File *in);
+	void loadSMF (File *in, int song);
+	void loadMultipleSMF (File *in);
+	void loadXMIDI (File *in);
 
 	void setLoop (bool loop);
 	void queueTrack (byte track, bool loop);

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -d -r1.197 -r1.198
--- simon.cpp	21 May 2003 05:12:04 -0000	1.197
+++ simon.cpp	21 May 2003 05:26:29 -0000	1.198
@@ -1069,7 +1069,8 @@
 
 	// midi.shutdown();
 	_mus_file->seek(_mus_offsets[a], SEEK_SET);
-	midi.playSMF (_mus_file, a);
+	midi.loadSMF (_mus_file, a);
+	midi.jump (0, 0);
 }
 
 Subroutine *SimonState::getSubroutineByID(uint subroutine_id) {
@@ -5280,9 +5281,9 @@
 		midi.stop();
 		_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music - 1], SEEK_SET);
 		if (_game & GF_WIN) {	
-			midi.playMultipleSMF (_game_file);
+			midi.loadMultipleSMF (_game_file);
 		} else {
-			midi.playXMIDI (_game_file);
+			midi.loadXMIDI (_game_file);
 		}
 
 		_last_music_played = music;
@@ -5299,10 +5300,10 @@
 			midi.stop();
 			if (_game & GF_WIN) {	
 				_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
-				midi.playMultipleSMF (_game_file);
+				midi.loadMultipleSMF (_game_file);
 			} else if (_game & GF_TALKIE) {	
 				_game_file->seek(_game_offsets_ptr[gss->MUSIC_INDEX_BASE + music], SEEK_SET);
-				midi.playSMF (_game_file, music);
+				midi.loadSMF (_game_file, music);
 			} else {
 				char buf[50];
 				File *f = new File();
@@ -5312,7 +5313,7 @@
 					warning("Can't load music from '%s'", buf);
 					return;
 				}
-				midi.playSMF (f, music);
+				midi.loadSMF (f, music);
 				delete f;
 			}
 			midi.jump (0, 0);