diff options
| author | Vitaly Novichkov <Wohlstand@users.noreply.github.com> | 2018-06-03 14:06:49 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-03 14:06:49 +0300 |
| commit | ae11d031fd9e802ccfdc1f2a7678c737fe6f85a9 (patch) | |
| tree | 80c0c098023e64db6020ce082149d98288c12638 | |
| parent | d7b9439df5d09d121c55a15f2bc25c360deeebe0 (diff) | |
| parent | 611aac1271c2e76b0ca634f136d8a7102ba94fd6 (diff) | |
| download | libADLMIDI-ae11d031fd9e802ccfdc1f2a7678c737fe6f85a9.tar.gz libADLMIDI-ae11d031fd9e802ccfdc1f2a7678c737fe6f85a9.tar.bz2 libADLMIDI-ae11d031fd9e802ccfdc1f2a7678c737fe6f85a9.zip | |
Merge pull request #103 from jpcima/build-nobanks
fix build under dynamic bank map and embedded banks disabled
| -rw-r--r-- | src/adlmidi_bankmap.h | 2 | ||||
| -rw-r--r-- | src/adlmidi_load.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/adlmidi_bankmap.h b/src/adlmidi_bankmap.h index 178a1c1..e4534cd 100644 --- a/src/adlmidi_bankmap.h +++ b/src/adlmidi_bankmap.h @@ -51,6 +51,8 @@ public: { return m_size; } size_t capacity() const { return m_capacity; } + bool empty() const + { return m_size == 0; } class iterator; iterator begin() const; diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp index ac9d51a..c75bed4 100644 --- a/src/adlmidi_load.cpp +++ b/src/adlmidi_load.cpp @@ -318,7 +318,7 @@ bool MIDIplay::LoadMIDI(MIDIplay::fileReader &fr) errorString.clear(); #ifdef DISABLE_EMBEDDED_BANKS - if((opl.AdlBank != ~0u) || (opl.dynamic_metainstruments.size() < 256)) + if((opl.AdlBank != ~0u) || opl.dynamic_banks.empty()) { errorStringOut = "Bank is not set! Please load any instruments bank by using of adl_openBankFile() or adl_openBankData() functions!"; return false; |