From 9544965f28ce42b69f97e6aaeb881c9a20bfbad4 Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Mon, 23 Jul 2018 10:37:13 +0200 Subject: preserve the data of operator 3-4 in internal storage, regardless of being 2op/4op --- src/adlmidi_private.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/adlmidi_private.cpp') 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]; } } -- cgit v1.2.3 From 4802570b77fde4aefa5a99c33cc012a2591e8361 Mon Sep 17 00:00:00 2001 From: JP Cimalando Date: Tue, 31 Jul 2018 03:04:20 +0200 Subject: fix the gcc warning "class-memaccess" --- src/adlmidi_private.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/adlmidi_private.cpp') diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index dd43725..43fe8de 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -72,7 +72,7 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) if(insno == 198) continue; ++n_total[a / 128]; - adlinsdata2 ins(adlins[insno]); + adlinsdata2 ins = adlinsdata2::from_adldata(::adlins[insno]); if((ins.flags & adlinsdata::Flag_Real4op) != 0) ++n_fourop[a / 128]; } -- cgit v1.2.3