diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-07-26 02:29:54 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-07-26 02:29:54 +0300 |
| commit | 553826d16b96fb43a2d18b497c31279b03ee5cb9 (patch) | |
| tree | 59bf11e87a92c1965f018422c65e8fde6b57b6b4 /src/adlmidi_private.cpp | |
| parent | e340bd10e45299bd8fb5d683c9b0e963aa2ef770 (diff) | |
| parent | 1f90cf121ffb444db9db5fe1e5a5017a3450bac1 (diff) | |
| download | libADLMIDI-553826d16b96fb43a2d18b497c31279b03ee5cb9.tar.gz libADLMIDI-553826d16b96fb43a2d18b497c31279b03ee5cb9.tar.bz2 libADLMIDI-553826d16b96fb43a2d18b497c31279b03ee5cb9.zip | |
Merge branch 'master' into velocity-offset
# Conflicts:
# src/adlmidi_load.cpp
Diffstat (limited to 'src/adlmidi_private.cpp')
| -rw-r--r-- | src/adlmidi_private.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index ecedd9e..dd43725 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -56,7 +56,7 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) adlinsdata2 &ins = it->second.ins[i]; if(ins.flags & adlinsdata::Flag_NoSound) continue; - if((ins.adl[0] != ins.adl[1]) && ((ins.flags & adlinsdata::Flag_Pseudo4op) == 0)) + if((ins.flags & adlinsdata::Flag_Real4op) != 0) ++n_fourop[div]; ++n_total[div]; } @@ -73,7 +73,7 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) continue; ++n_total[a / 128]; adlinsdata2 ins(adlins[insno]); - if(ins.flags & adlinsdata::Flag_Real4op) + if((ins.flags & adlinsdata::Flag_Real4op) != 0) ++n_fourop[a / 128]; } } |