diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-20 23:26:50 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-20 23:26:50 -0400 |
| commit | 78296d2c18c324f0fbfa6add4eca6ad5f9995775 (patch) | |
| tree | 395c1440e5ec7d4457ee86c08cb2bf72d6a69a27 | |
| parent | 9c323c59ef8637ee418785fb26d76770909d5b63 (diff) | |
tentative fix for a crash that occurs when switching backends.5.0-pre1
Session::process() returns early with Session::_silent set to true. AudioBuffer::set_data()
was never set for (at least) the LTC output port. PortManager::cycle_end() calls
AudioBuffer::silence() which used to assume that get_buffer() must have been called. But it
was not, because that should have happened in Session::process().
So check AudioBuffer::data() and call get_buffer() if required.
| -rw-r--r-- | libs/ardour/ardour/audio_buffer.h | 8 | ||||
| -rw-r--r-- | libs/ardour/audio_port.cc | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h index 051b75ab4b..9a9653b2c9 100644 --- a/libs/ardour/ardour/audio_buffer.h +++ b/libs/ardour/ardour/audio_buffer.h @@ -220,7 +220,13 @@ public: */ bool check_silence (pframes_t nframes, pframes_t& n) const; - void prepare () { _written = false; _silent = false; } + void prepare () { + if (!_owns_data) { + _data = 0; + } + _written = false; + _silent = false; + } bool written() const { return _written; } void set_written(bool w) { _written = w; } diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc index e2bb20dbe9..33e41c10ad 100644 --- a/libs/ardour/audio_port.cc +++ b/libs/ardour/audio_port.cc @@ -59,8 +59,11 @@ void AudioPort::cycle_end (pframes_t nframes) { if (sends_output() && !_buffer->written()) { - if (_buffer->capacity() >= nframes) { - _buffer->silence (nframes); + if (!_buffer->data (0)) { + get_audio_buffer (nframes); + } + if (_buffer->capacity() >= nframes) { + _buffer->silence (nframes); } } } |