diff options
| -rw-r--r-- | src/adlmidi_private.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/src/adlmidi_private.cpp b/src/adlmidi_private.cpp index 920f5dc..7a8b3b2 100644 --- a/src/adlmidi_private.cpp +++ b/src/adlmidi_private.cpp @@ -36,17 +36,15 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) //For custom bank for(size_t a = 0; a < play->opl.dynamic_metainstruments.size(); ++a) { + adlinsdata2 &ins = play->opl.dynamic_metainstruments[a]; + if(ins.flags & adlinsdata::Flag_NoSound) + continue; + size_t div = (a >= play->opl.dynamic_percussion_offset) ? 1 : 0; ++n_total[div]; - adlinsdata2 &ins = play->opl.dynamic_metainstruments[a]; if(ins.flags & adlinsdata::Flag_Real4op) ++n_fourop[div]; } - - play->m_setup.NumFourOps = ((n_fourop[0] == 0) && (n_fourop[1] == 0)) ? 0 - : (n_fourop[0] >= (128 * 7) / 8) ? play->m_setup.NumCards * 6 - : (n_fourop[0] < (128 * 1) / 8) ? (n_fourop[1] > 0 ? 4 : 0) - : (play->m_setup.NumCards == 1 ? 1 : play->m_setup.NumCards * 4); } else { @@ -61,22 +59,14 @@ int adlRefreshNumCards(ADL_MIDIPlayer *device) if(ins.flags & adlinsdata::Flag_Real4op) ++n_fourop[a / 128]; } - - play->m_setup.NumFourOps = ((n_fourop[0] == 0) && (n_fourop[1] == 0)) ? 0 - : (n_fourop[0] >= ((n_total[0] % 128) * 7) / 8) ? play->m_setup.NumCards * 6 - : (n_fourop[0] < ((n_total[0] % 128) * 1) / 8) ? 0 - : (play->m_setup.NumCards == 1 ? 1 : play->m_setup.NumCards * 4); } - play->opl.NumFourOps = play->m_setup.NumFourOps; + unsigned NumFourOps = ((n_fourop[0] == 0) && (n_fourop[1] == 0)) ? 0 + : (n_fourop[0] >= (n_total[0] * 7) / 8) ? play->m_setup.NumCards * 6 + : (n_fourop[0] < (n_total[0] * 1) / 8) ? 0 + : (play->m_setup.NumCards == 1 ? 1 : play->m_setup.NumCards * 4); - if(n_fourop[0] >= n_total[0] * 15 / 16 && play->m_setup.NumFourOps == 0) - { - play->setErrorString("ERROR: You have selected a bank that consists almost exclusively of four-op patches.\n" - " The results (silence + much cpu load) would be probably\n" - " not what you want, therefore ignoring the request.\n"); - return -1; - } + play->opl.NumFourOps = play->m_setup.NumFourOps = NumFourOps; return 0; } |