aboutsummaryrefslogtreecommitdiff
path: root/src/adlmidi_private.cpp
diff options
context:
space:
mode:
authorJP Cimalando <jpcima@users.noreply.github.com>2018-05-16 01:31:18 +0200
committerJP Cimalando <jpcima@users.noreply.github.com>2018-05-16 19:35:30 +0200
commit9b478615e7f0cd73c360fd289b05db52b5f730f1 (patch)
tree718629304c857bfe69d930c428bddd12ec02ee04 /src/adlmidi_private.cpp
parent8cce88f8706ca6fb52592458aa12641c43469a6e (diff)
downloadlibADLMIDI-9b478615e7f0cd73c360fd289b05db52b5f730f1.tar.gz
libADLMIDI-9b478615e7f0cd73c360fd289b05db52b5f730f1.tar.bz2
libADLMIDI-9b478615e7f0cd73c360fd289b05db52b5f730f1.zip
storing adldata and adlinsdata in unified structures
Diffstat (limited to 'src/adlmidi_private.cpp')
-rw-r--r--src/adlmidi_private.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp
index 1f3cb7d..1e62250 100644
--- a/src/adlmidi_private.cpp
+++ b/src/adlmidi_private.cpp
@@ -38,8 +38,8 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device)
{
size_t div = (a >= play->opl.dynamic_percussion_offset) ? 1 : 0;
++n_total[div];
- adlinsdata &ins = play->opl.dynamic_metainstruments[a];
- if((ins.adlno1 != ins.adlno2) && ((ins.flags & adlinsdata::Flag_Pseudo4op) == 0))
+ adlinsdata2 &ins = play->opl.dynamic_metainstruments[a];
+ if((ins.adl[0] != ins.adl[1]) && ((ins.flags & adlinsdata::Flag_Pseudo4op) == 0))
++n_fourop[div];
}
@@ -57,8 +57,8 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device)
if(insno == 198)
continue;
++n_total[a / 128];
- const adlinsdata &ins = adlins[insno];
- if((ins.adlno1 != ins.adlno2) && ((ins.flags & adlinsdata::Flag_Pseudo4op) == 0))
+ adlinsdata2 ins(adlins[insno]);
+ if((ins.adl[0] != ins.adl[1]) && ((ins.flags & adlinsdata::Flag_Pseudo4op) == 0))
++n_fourop[a / 128];
}