[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,2.35,2.36

Jamieson Christian jamieson630 at users.sourceforge.net
Fri May 16 14:07:21 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv31868/scummvm/scumm

Modified Files:
	imuse.cpp 
Log Message:
And yet more cleanup

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 2.35
retrieving revision 2.36
diff -u -d -r2.35 -r2.36
--- imuse.cpp	16 May 2003 20:38:02 -0000	2.35
+++ imuse.cpp	16 May 2003 21:06:54 -0000	2.36
@@ -297,8 +297,6 @@
 	bool _initialized;
 	byte _volume_fader_counter;
 
-	int _game_tempo;
-
 	uint _queue_end, _queue_pos, _queue_sound;
 	byte _queue_adding;
 
@@ -1603,7 +1601,11 @@
 uint32 IMuseInternal::property(int prop, uint32 value) {
 	switch (prop) {
 	case IMuse::PROP_TEMPO_BASE:
-		_game_tempo = value;
+		// Jamieson630: This used to specify a low-level microsecond
+		// timing override for the MIDI drivers, based on the -t
+		// option. It hasn't worked for a while, but may come back
+		// later as a more user-friendly adjustment option.
+//		_game_tempo = value;
 		break;
 	}
 	return 0;
@@ -1626,7 +1628,6 @@
 		error ("IMuse was initialized without a MIDI driver (even the NULL driver)");
 
 	_midi_native = midi;
-	_game_tempo = _midi_native->getBaseTempo();
 	initMidiDriver (_midi_native);
 
 	_master_volume = 255;
@@ -1748,6 +1749,7 @@
 
 	_parts = NULL;
 	_active = true;
+	_midi = midi;
 	_id = sound;
 	_priority = 0x80;
 	_volume = 0x7F;
@@ -1762,9 +1764,9 @@
 	hook_clear();
 	if (start_seq_sound(sound) != 0) {
 		_active = false;
+		_midi = NULL;
 		return false;
 	}
-	_midi = midi;
 	return true;
 }
 
@@ -1808,7 +1810,7 @@
 void Player::set_tempo(uint32 b) {
 	uint32 i, j;
 
-	i = _se->_game_tempo;
+	i = _midi->getBaseTempo();
 
 	j = _tempo = b;
 





More information about the Scummvm-git-logs mailing list