diff options
| author | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-10 00:24:02 +0300 |
|---|---|---|
| committer | Vitaly Novichkov <admin@wohlnet.ru> | 2017-12-10 00:24:02 +0300 |
| commit | 51d6e05b7e7bc6fad529e9e023ceca9af34ed910 (patch) | |
| tree | 2074bd760ff007b4b9db28c7f1f7151d395030fe /src/adlmidi_midiplay.cpp | |
| parent | b5be0ef0b188ab5afeef825d80a0b00bfff30023 (diff) | |
| parent | 4ab6c7b2d81960b124974ddca5733a07c8dd5fc8 (diff) | |
| download | libADLMIDI-51d6e05b7e7bc6fad529e9e023ceca9af34ed910.tar.gz libADLMIDI-51d6e05b7e7bc6fad529e9e023ceca9af34ed910.tar.bz2 libADLMIDI-51d6e05b7e7bc6fad529e9e023ceca9af34ed910.zip | |
Merge branch 'master' into get-rid-of-backup-buffer
# Conflicts:
# src/adlmidi.cpp
Diffstat (limited to 'src/adlmidi_midiplay.cpp')
| -rw-r--r-- | src/adlmidi_midiplay.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/adlmidi_midiplay.cpp b/src/adlmidi_midiplay.cpp index 69db6b0..dacb2b1 100644 --- a/src/adlmidi_midiplay.cpp +++ b/src/adlmidi_midiplay.cpp @@ -241,7 +241,6 @@ void MIDIplay::MidiTrackRow::sortEvents(bool *noteStates) for(std::set<size_t>::iterator j = markAsOn.begin(); j != markAsOn.end(); j++) noteStates[*j] = true; - } /***********************************************************************************/ @@ -2056,7 +2055,7 @@ void MIDIplay::HandleEvent(size_t tk, const MIDIplay::MidiEvent &evt, int &statu } } -long MIDIplay::CalculateAdlChannelGoodness(unsigned c, const MIDIchannel::NoteInfo::Phys &ins, uint16_t) +long MIDIplay::CalculateAdlChannelGoodness(unsigned c, const MIDIchannel::NoteInfo::Phys &ins, uint16_t) const { long s = -ch[c].koff_time_until_neglible; |