zdoom/zmusic
0
0
Fork 0
mirror of https://github.com/ZDoom/ZMusic.git synced 2025-02-06 23:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed EMIDI track designation checks.

Browse source
This commit is contained in:
Christoph Oelckers 2022-06-09 15:51:51 +02:00
parent 9fbc2ec095
commit 6b08c718b5
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
source/midisources/midisource_smf.cpp
View file

@ -178,16 +178,29 @@ MIDISong2::MIDISong2 (const uint8_t* data, size_t len)
// //
//========================================================================== //==========================================================================
enum
{
EMIDI_GeneralMIDI = 0,
EMIDI_SoundCanvas = 1,
EMIDI_AWE32 = 2,
EMIDI_WaveBlaster = 3,
EMIDI_SoundBlaster = 4,
EMIDI_ProAudio = 5,
EMIDI_SoundMan16 = 6,
EMIDI_Adlib = 7,
EMIDI_Soundscape = 8,
EMIDI_Ultrasound = 9,
};
void MIDISong2::CheckCaps(int tech) void MIDISong2::CheckCaps(int tech)
{ {
DesignationMask = 0xFF0F;
if (tech == MIDIDEV_FMSYNTH) if (tech == MIDIDEV_FMSYNTH)
{ {
DesignationMask = 0x00F0; DesignationMask = 1 << EMIDI_Adlib;
} }
else if (tech == MIDIDEV_MIDIPORT) else
{ {
DesignationMask = 0x0001; DesignationMask = 1 << EMIDI_GeneralMIDI;
} }
} }
@ -443,7 +456,12 @@ uint32_t *MIDISong2::SendCommand (uint32_t *events, TrackInfo *track, uint32_t d
case 111: // EMIDI Track Exclusion - InitBeat only case 111: // EMIDI Track Exclusion - InitBeat only
if (track->PlayedTime < (uint32_t)Division) if (track->PlayedTime < (uint32_t)Division)
{ {
if (track->Designated && data2 <= 9) if (!track->Designated)
{
track->Designation = ~0;
track->Designated = true;
}
if (data2 <= 9)
{ {
track->Designation &= ~(1 << data2); track->Designation &= ~(1 << data2);
} }