diff options
| author | David Robillard <d@drobilla.net> | 2016-11-06 22:04:35 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-12-03 15:18:21 -0500 |
| commit | 08fffeffec10beb708610fd35eb9e7c35365d446 (patch) | |
| tree | ce9c8c77e6a926b4d8be90052c32945b7718bb4b /libs/ardour/midi_state_tracker.cc | |
| parent | 875b1367b2c4750ecd861424c57ed4bcc9c642d2 (diff) | |
Remove Evoral::MIDIEvent
It is slightly questionable whether type specific methods like
velocity() belong on Event at all, these may be better off as free
functions. However the code currently uses them as methods in many
places, and it seems like a step in the right direction, since, for
example, we might some day have events that have a velocity but aren't
stored as MIDI messages (e.g. if Ardour uses an internal musical model
that is more expressive).
In any case, the former inheritance and plethora of sloppy casts is
definitely not the right thing.
Diffstat (limited to 'libs/ardour/midi_state_tracker.cc')
| -rw-r--r-- | libs/ardour/midi_state_tracker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index 3e81a064c8..17ecd10e94 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -122,7 +122,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time) for (int note = 0; note < 128; ++note) { while (_active_notes[note + 128 * channel]) { uint8_t buffer[3] = { ((uint8_t) (MIDI_CMD_NOTE_OFF | channel)), uint8_t (note), 0 }; - Evoral::MIDIEvent<MidiBuffer::TimeType> noteoff + Evoral::Event<MidiBuffer::TimeType> noteoff (MIDI_CMD_NOTE_OFF, time, 3, buffer, false); /* note that we do not care about failure from push_back() ... should we warn someone ? @@ -181,7 +181,7 @@ MidiStateTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock, for (int channel = 0; channel < 16; ++channel) { for (int note = 0; note < 128; ++note) { while (_active_notes[note + 128 * channel]) { - Evoral::MIDIEvent<Evoral::Beats> ev ((MIDI_CMD_NOTE_OFF|channel), time, 3, 0, true); + Evoral::Event<Evoral::Beats> ev ((MIDI_CMD_NOTE_OFF|channel), time, 3, 0, true); ev.set_type (MIDI_CMD_NOTE_OFF); ev.set_channel (channel); ev.set_note (note); |