diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-06 01:56:50 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2018-08-06 01:56:50 +0300 |
| commit | 1ab34e88a326c396fbb42c503eb4ffa56fa0a148 (patch) | |
| tree | 4f2d6ada0ab0bd1d64947a71c5492a29be7c8dbf /src/adlmidi_private.cpp | |
| parent | 0a003c8bc12514a5586f2f0e40559fcbf6607883 (diff) | |
| parent | 0e2807a9d4c8c900e85c9b33ba96c69a82c58a68 (diff) | |
| download | libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.gz libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.tar.bz2 libADLMIDI-1ab34e88a326c396fbb42c503eb4ffa56fa0a148.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/adlmidi_private.cpp')
| -rw-r--r-- | src/adlmidi_private.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index ecedd9e..43fe8de 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]; } @@ -72,8 +72,8 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) if(insno == 198) continue; ++n_total[a / 128]; - adlinsdata2 ins(adlins[insno]); - if(ins.flags & adlinsdata::Flag_Real4op) + adlinsdata2 ins = adlinsdata2::from_adldata(::adlins[insno]); + if((ins.flags & adlinsdata::Flag_Real4op) != 0) ++n_fourop[a / 128]; } } |