optimization for track with zero audio channels should not short-circuit MIDI disk...

[ardour.git] / libs / ardour / audio_port.cc

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index 2fecbf9392c1f5b9600da044f0678c9315164d0d..70943e35a308ef47a475372cb08b86d4fad821ef 100644 (file)
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -58,7 +58,10 @@ AudioPort::cycle_start (pframes_t nframes)
 void
 AudioPort::cycle_end (pframes_t nframes)
 {
-        if (sends_output() && !_buffer->written()) {
+       if (sends_output() && !_buffer->written() && _port_handle) {
+               if (!_buffer->data (0)) {
+                       get_audio_buffer (nframes);
+               }
                if (_buffer->capacity() >= nframes) {
                        _buffer->silence (nframes);
                }
@@ -74,15 +77,17 @@ AudioBuffer&
 AudioPort::get_audio_buffer (pframes_t nframes)
 {
        /* caller must hold process lock */
+       assert (_port_handle);
        _buffer->set_data ((Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes) +
                           _global_port_buffer_offset + _port_buffer_offset, nframes);
        return *_buffer;
 }
 
-Sample* 
+Sample*
 AudioPort::engine_get_whole_audio_buffer ()
 {
        /* caller must hold process lock */
+       assert (_port_handle);
        return (Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes);
 }