[Scummvm-cvs-logs] CVS: scummvm/backends/midi adlib.cpp,1.28,1.29 coreaudio.cpp,1.6,1.7

Max Horn fingolfin at users.sourceforge.net
Wed Jul 2 16:25:02 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv30622

Modified Files:
	adlib.cpp coreaudio.cpp 
Log Message:
cleanup

Index: adlib.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/adlib.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- adlib.cpp	15 Jun 2003 01:05:03 -0000	1.28
+++ adlib.cpp	2 Jul 2003 23:24:05 -0000	1.29
@@ -595,8 +595,8 @@
 
 	void generate_samples(int16 *buf, int len);
 	void on_timer();
-	void part_key_on (AdlibPart *part, AdlibInstrument *instr, byte note, byte velocity);
-	void part_key_off (AdlibPart *part, byte note);
+	void part_key_on(AdlibPart *part, AdlibInstrument *instr, byte note, byte velocity);
+	void part_key_off(AdlibPart *part, byte note);
 
 	void adlib_key_off(int chan);
 	void adlib_note_on(int chan, byte note, int mod);
@@ -616,7 +616,7 @@
 	void reset_tick();
 	void mc_off(AdlibVoice * voice);
 
-	static void link_mc (AdlibPart *part, AdlibVoice *voice);
+	static void link_mc(AdlibPart *part, AdlibVoice *voice);
 	void mc_inc_stuff(AdlibVoice *voice, Struct10 * s10, Struct11 * s11);
 	void mc_init_stuff(AdlibVoice *voice, Struct10 * s10, Struct11 * s11, byte flags,
 	                   InstrumentExtra * ie);
@@ -625,7 +625,7 @@
 	static byte struct10_ontimer(Struct10 * s10, Struct11 * s11);
 	static void struct10_setup(Struct10 * s10);
 	static int random_nr(int a);
-	void mc_key_on (AdlibVoice *voice, AdlibInstrument *instr, byte note, byte velocity);
+	void mc_key_on(AdlibVoice *voice, AdlibInstrument *instr, byte note, byte velocity);
 
 	static void premix_proc(void *param, int16 *buf, uint len);
 };
@@ -1000,7 +1000,7 @@
 		_next_tick -= step;
 		if (!_next_tick) {
 			if (_timer_proc)
-				(*_timer_proc) (_timer_param);
+				(*_timer_proc)(_timer_param);
 			on_timer();
 			reset_tick();
 		}

Index: coreaudio.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/coreaudio.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- coreaudio.cpp	11 Jun 2003 05:54:46 -0000	1.6
+++ coreaudio.cpp	2 Jul 2003 23:24:05 -0000	1.7
@@ -101,17 +101,17 @@
 }
 
 void MidiDriver_CORE::send(uint32 b) {
-	unsigned char first_byte, seccond_byte, status_byte;
+	unsigned char first_byte, second_byte, status_byte;
 	status_byte = (b & 0x000000FF);
 	first_byte = (b & 0x0000FF00) >> 8;
-	seccond_byte = (b & 0x00FF0000) >> 16;
+	second_byte = (b & 0x00FF0000) >> 16;
 
 #ifdef COREAUDIO_REVERB_HACK
 	if ((status_byte&0xF0) == 0xB0 && first_byte == 0x5b)
 		return;
 #endif
 
-	MusicDeviceMIDIEvent(au_MusicDevice, status_byte, first_byte, seccond_byte, 0);
+	MusicDeviceMIDIEvent(au_MusicDevice, status_byte, first_byte, second_byte, 0);
 }
 
 void MidiDriver_CORE::sysEx(byte *msg, uint16 length) {





More information about the Scummvm-git-logs mailing list