[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.17,1.18 mixer.cpp,1.34,1.35 mpu401.cpp,1.5,1.6

[Max Horn]

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

Modified Files:
	mididrv.h mixer.cpp mpu401.cpp 
Log Message:
PalmOS changes

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- mididrv.h	6 Mar 2003 21:46:55 -0000	1.17
+++ mididrv.h	30 Apr 2003 12:51:06 -0000	1.18
@@ -123,7 +123,9 @@
 	MD_COREAUDIO = 7,
 	MD_MIDIEMU = 8,
 	MD_ALSA = 9,
-	MD_ADLIB = 10
+	MD_ADLIB = 10,
+	
+	MD_YPA1 = 100	// palmos
 };
 
 // Factory functions, for faster compile
@@ -135,5 +137,6 @@
 extern MidiDriver *MidiDriver_CORE_create();
 extern MidiDriver *MidiDriver_ETUDE_create();
 extern MidiDriver *MidiDriver_ALSA_create();
+extern MidiDriver *MidiDriver_YamahaPa1_create();
 
 #endif

Index: mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mixer.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- mixer.cpp	30 Mar 2003 16:54:03 -0000	1.34
+++ mixer.cpp	30 Apr 2003 12:51:06 -0000	1.35
@@ -26,6 +26,8 @@
 #include "common/file.h"
 
 SoundMixer::SoundMixer() {
+	memset(this,0,sizeof(SoundMixer)); // palmos
+
 	_volumeTable = (int16 *)calloc(256 * sizeof(int16), 1);
 	_beginSlots = 0;
 	for (int i = 0; i != NUM_CHANNELS; i++) {

Index: mpu401.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mpu401.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mpu401.cpp	6 Mar 2003 21:46:56 -0000	1.5
+++ mpu401.cpp	30 Apr 2003 12:51:07 -0000	1.6
@@ -64,6 +64,11 @@
 
 MidiDriver_MPU401::MidiDriver_MPU401() : MidiDriver() {
 	uint i;
+	
+	_started_thread = false;	// palmos
+	_timer_proc = NULL;			// palmos
+	_timer_param = NULL;		// palmos
+	
 	for (i = 0; i < ARRAYSIZE(_midi_channels); ++i) {
 		_midi_channels [i].init (this, i);
 	}
@@ -95,7 +100,7 @@
 	}
 }
 
-#if !defined(__MORPHOS__)
+#if !defined(__MORPHOS__) && !defined(__PALM_OS__)
 int MidiDriver_MPU401::midi_driver_thread(void *param) {
 	MidiDriver_MPU401 *mid = (MidiDriver_MPU401 *)param;
 	int old_time, cur_time;