[Scummvm-cvs-logs] CVS: scummvm/sound midiparser.h,1.8,1.9 midiparser.cpp,1.3,1.4

Jamieson Christian jamieson630 at users.sourceforge.net
Tue May 20 23:15:05 CEST 2003


Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv31304

Modified Files:
	midiparser.h midiparser.cpp 
Log Message:
More Simon music fixes

Index: midiparser.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- midiparser.h	20 May 2003 03:27:45 -0000	1.8
+++ midiparser.h	21 May 2003 06:14:14 -0000	1.9
@@ -106,7 +106,7 @@
 	void setTimerRate (uint32 rate) { _timer_rate = rate / 500; }
 	void onTimer();
 
-	void setTrack (byte track);
+	bool setTrack (int track);
 	void jumpToTick (uint32 tick);
 
 	static MidiParser *createParser_SMF();

Index: midiparser.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/midiparser.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- midiparser.cpp	20 May 2003 16:38:54 -0000	1.3
+++ midiparser.cpp	21 May 2003 06:14:14 -0000	1.4
@@ -152,14 +152,18 @@
 	_running_status = 0;
 }
 
-void MidiParser::setTrack (byte track) {
-	if (track >= _num_tracks || track == _active_track)
-		return;
+bool MidiParser::setTrack (int track) {
+	if (track >= _num_tracks)
+		return false;
+	else if (track == _active_track)
+		return true;
+
 	resetTracking();
 	allNotesOff();
 	_active_track = track;
 	_play_pos = _tracks[track];
 	parseNextEvent (_next_event);
+	return true;
 }
 
 void MidiParser::jumpToTick (uint32 tick) {





More information about the Scummvm-git-logs mailing list