ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Mark user-created events as live MIDI

Browse Source
This commit is contained in:
Robin Gareus 2020-09-19 22:49:52 +02:00
parent f9cdf533ba
commit 56b94b3fc4
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/ardour/async_midi_port.cc
View File

@ -257,12 +257,14 @@ AsyncMIDIPort::write (const MIDI::byte * msg, size_t msglen, MIDI::timestamp_t t
vec.buf[0]->set_buffer (0, 0, true);
}
vec.buf[0]->set (msg, msglen, timestamp);
vec.buf[0]->set_event_type (Evoral::LIVE_MIDI_EVENT);
} else {
/* see comment in previous branch of if() statement */
if (!vec.buf[1]->owns_buffer()) {
vec.buf[1]->set_buffer (0, 0, true);
}
vec.buf[1]->set (msg, msglen, timestamp);
vec.buf[1]->set_event_type (Evoral::LIVE_MIDI_EVENT);
}
output_fifo.increment_write_idx (1);
@ -297,7 +299,7 @@ AsyncMIDIPort::write (const MIDI::byte * msg, size_t msglen, MIDI::timestamp_t t
timestamp = _last_write_timestamp;
}
if (mb.push_back (timestamp, Evoral::MIDI_EVENT, msglen, msg)) {
if (mb.push_back (timestamp, Evoral::LIVE_MIDI_EVENT, msglen, msg)) {
ret = msglen;
_last_write_timestamp = timestamp;

4
libs/ardour/midi_port.cc
View File

@ -163,9 +163,9 @@ MidiPort::get_midi_buffer (pframes_t nframes)
ev[0] = 0x80 | (buf[0] & 0x0F); /* note off */
ev[1] = buf[1];
ev[2] = 0x40; /* default velocity */
_buffer->push_back (timestamp, Evoral::MIDI_EVENT, size, ev);
_buffer->push_back (timestamp, Evoral::LIVE_MIDI_EVENT, size, ev);
} else {
_buffer->push_back (timestamp, Evoral::MIDI_EVENT, size, buf);
_buffer->push_back (timestamp, Evoral::LIVE_MIDI_EVENT, size, buf);
}
}

2
libs/ardour/midi_track.cc
View File

@ -696,7 +696,7 @@ MidiTrack::MidiControl::actually_set_value (double val, PBD::Controllable::Group
size = 0;
assert(false);
}
_route->write_immediate_event(Evoral::MIDI_EVENT, size, ev);
_route->write_immediate_event(Evoral::LIVE_MIDI_EVENT, size, ev);
}
AutomationControl::actually_set_value(val, group_override);