smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-07 14:15:46 +01:00
Code Issues Projects Releases Wiki Activity

Ignore cycle-start/end for unregistered ports

Browse source 
Should fix a race during Session::destroy(), Port::PortDrop
which unregisters ports with the backend, but the actual port instance
will still exist.

The engine does no longer have a session-pointer and only calls
CycleStart(); CycleEnd() to clear port-buffers. Trying to clear
and already unregistered Port will crash.
This commit is contained in:
Robin Gareus 2017-08-03 19:16:33 +02:00
parent 8b380a423a
commit 1937c74191
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libs/ardour/audio_port.cc
View file

@ -58,12 +58,12 @@ AudioPort::cycle_start (pframes_t nframes)
void
AudioPort::cycle_end (pframes_t nframes)
{
if (sends_output() && !_buffer->written()) {
if (!_buffer->data (0)) {
get_audio_buffer (nframes);
}
if (_buffer->capacity() >= nframes) {
_buffer->silence (nframes);
if (sends_output() && !_buffer->written() && _port_handle) {
if (!_buffer->data (0)) {
get_audio_buffer (nframes);
}
if (_buffer->capacity() >= nframes) {
_buffer->silence (nframes);
}
}
}

2
libs/ardour/midi_port.cc
View file

@ -65,7 +65,7 @@ MidiPort::cycle_start (pframes_t nframes)
_buffer->clear ();
if (sends_output ()) {
if (sends_output () && _port_handle) {
port_engine.midi_clear (port_engine.get_buffer (_port_handle, nframes));
}