diff options
| author | Max Horn | 2003-04-30 12:51:07 +0000 |
|---|---|---|
| committer | Max Horn | 2003-04-30 12:51:07 +0000 |
| commit | 01d3067b7dd5697d7a0cead1516e23657df5d3b7 (patch) | |
| tree | a512cbf88ee19f0654c086df9250384d95ff766e /sound | |
| parent | 38b6a9f0901b33b65ec8adeb7e7207e432f55ce1 (diff) | |
| download | scummvm-rg350-01d3067b7dd5697d7a0cead1516e23657df5d3b7.tar.gz scummvm-rg350-01d3067b7dd5697d7a0cead1516e23657df5d3b7.tar.bz2 scummvm-rg350-01d3067b7dd5697d7a0cead1516e23657df5d3b7.zip | |
PalmOS changes
svn-id: r7222
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mididrv.h | 5 | ||||
| -rw-r--r-- | sound/mixer.cpp | 2 | ||||
| -rw-r--r-- | sound/mpu401.cpp | 7 |
3 files changed, 12 insertions, 2 deletions
diff --git a/sound/mididrv.h b/sound/mididrv.h index 114371921e..58eac956a6 100644 --- a/sound/mididrv.h +++ b/sound/mididrv.h @@ -123,7 +123,9 @@ enum { 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_QT_create(); extern MidiDriver *MidiDriver_CORE_create(); extern MidiDriver *MidiDriver_ETUDE_create(); extern MidiDriver *MidiDriver_ALSA_create(); +extern MidiDriver *MidiDriver_YamahaPa1_create(); #endif diff --git a/sound/mixer.cpp b/sound/mixer.cpp index 1d4ebde0b8..e3743c4f41 100644 --- a/sound/mixer.cpp +++ b/sound/mixer.cpp @@ -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++) { diff --git a/sound/mpu401.cpp b/sound/mpu401.cpp index 85b42bddf9..6c946ff686 100644 --- a/sound/mpu401.cpp +++ b/sound/mpu401.cpp @@ -64,6 +64,11 @@ void MidiChannel_MPU401::sysEx_customInstrument(uint32 type, byte *instr) { 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 @@ void MidiDriver_MPU401::setTimerCallback (void *timer_param, void (*timer_proc) } } -#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; |