diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-11-25 00:08:30 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-11-25 00:08:30 +0300 |
| commit | a2eba8ab1f73c884783cdae2f839221bf5a6244d (patch) | |
| tree | 3492dbb31f0164425cd56036084b3285889694b3 /src/adlmidi_midiplay.cpp | |
| parent | 0941a92468d75b6440ca814029e9bb37d75c89d5 (diff) | |
| parent | 7bdff7f495e3e83745a1737d039af4599275fae0 (diff) | |
| download | libADLMIDI-a2eba8ab1f73c884783cdae2f839221bf5a6244d.tar.gz libADLMIDI-a2eba8ab1f73c884783cdae2f839221bf5a6244d.tar.bz2 libADLMIDI-a2eba8ab1f73c884783cdae2f839221bf5a6244d.zip | |
Merge branch 'master' into get-rid-of-backup-buffer
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index a2e4c9e..9fad9ec 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -25,7 +25,7 @@ // Mapping from MIDI volume level to OPL level value. -#if defined(ANDROID) && (cplusplus < 201103L) +#if defined(ANDROID) && (__cplusplus < 201103L) namespace std { int snprintf(char *out, size_t len, const char *fmt, ...) @@ -1091,7 +1091,7 @@ bool MIDIplay::realTime_NoteOn(uint8_t channel, uint8_t note, uint8_t velocity) expected_mode = PercussionMap[midiins & 0xFF]; } - if(opl.four_op_category[a] != (uint32_t)expected_mode) + if(opl.four_op_category[a] != expected_mode) continue; } else |