diff options
author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-05-19 19:55:47 +0300 |
---|---|---|
committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-05-19 19:55:47 +0300 |
commit | bed6bcb220346c622a307bf405b9a1e87fd99db5 (patch) | |
tree | e1bdbcb286208ad7053ae625bf33c8ee6c5b5a29 /src/adlmidi_midiplay.cpp | |
parent | 2654f224a0d875d265e0574b7746482c97e0d8a5 (diff) | |
download | libADLMIDI-bed6bcb220346c622a307bf405b9a1e87fd99db5.tar.gz libADLMIDI-bed6bcb220346c622a307bf405b9a1e87fd99db5.tar.bz2 libADLMIDI-bed6bcb220346c622a307bf405b9a1e87fd99db5.zip |
OpenWatcom compilation fix
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
-rw-r--r-- | src/adlmidi_midiplay.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 5f3ce57..1ee7cfb 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -1093,11 +1093,21 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) //uint16_t i[2] = { ains.adlno1, ains.adlno2 }; bool pseudo_4op = ains.flags & adlinsdata::Flag_Pseudo4op; +#ifndef __WATCOMC__ MIDIchannel::NoteInfo::Phys voices[MIDIchannel::NoteInfo::MaxNumPhysChans] = { {0, ains.adl[0], false}, {0, ains.adl[1], pseudo_4op} }; +#else /* Unfortunately, WatCom can't brace-initialize structure that incluses structure fields */ + MIDIchannel::NoteInfo::Phys voices[MIDIchannel::NoteInfo::MaxNumPhysChans]; + voices[0].chip_chan = 0; + voices[0].ains = ains.adl[0]; + voices[0].pseudo4op = false; + voices[1].chip_chan = 0; + voices[1].ains = ains.adl[1]; + voices[1].pseudo4op = pseudo_4op; +#endif if((opl.AdlPercussionMode == 1) && PercussionMap[midiins & 0xFF]) voices[1] = voices[0];//i[1] = i[0]; |