diff options
| -rw-r--r-- | src/adlmidi_load.cpp | 4 | ||||
| -rw-r--r-- | src/adlmidi_private.hpp | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/adlmidi_load.cpp b/src/adlmidi_load.cpp index 4df4b32..67faead 100644 --- a/src/adlmidi_load.cpp +++ b/src/adlmidi_load.cpp @@ -354,7 +354,7 @@ bool MIDIplay::LoadMIDI(MIDIplay::fileReader &fr) #ifdef DISABLE_EMBEDDED_BANKS if((opl.AdlBank != ~0u) || (opl.dynamic_metainstruments.size() < 256)) { - ADLMIDI_ErrorString = "Bank is not set! Please load any instruments bank by using of adl_openBankFile() or adl_openBankData() functions!"; + errorStringOut = "Bank is not set! Please load any instruments bank by using of adl_openBankFile() or adl_openBankData() functions!"; return false; } #endif @@ -419,8 +419,6 @@ riffskip: else if(std::memcmp(HeaderBuf, "MUS\x1A", 4) == 0) { // MUS/DMX files (Doom) - //uint64_t start = ReadLEint(HeaderBuf + 6, 2); - //is_MUS = true; fr.seek(0, SEEK_END); size_t mus_len = fr.tell(); fr.seek(0, SEEK_SET); diff --git a/src/adlmidi_private.hpp b/src/adlmidi_private.hpp index c08658e..bdf9577 100644 --- a/src/adlmidi_private.hpp +++ b/src/adlmidi_private.hpp @@ -238,6 +238,7 @@ public: void Poke(size_t card, uint32_t index, uint32_t value); void PokeN(size_t card, uint16_t index, uint8_t value); + void NoteOff(size_t c); void NoteOn(unsigned c, double hertz); void Touch_Real(unsigned c, unsigned volume); @@ -251,10 +252,6 @@ public: void Reset(unsigned long PCM_RATE); }; -/* - * TODO: Put usage of those hooks to the places where originally was UI usage. - * Also, provide external API to set those hooks - */ /** * @brief Hooks of the internal events @@ -402,9 +399,7 @@ public: return std::getc(fp); else { - if(mp_tell >= mp_size) - return -1; - + if(mp_tell >= mp_size) return -1; int x = reinterpret_cast<unsigned char *>(mp)[mp_tell]; mp_tell++; return x; |