X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_port.cc;h=556f6e0c2a0775ae6430e8f5eda76036acbf126d;hb=c99738d88e8a2ad806b219b9f3614a6b55b6bf37;hp=aad56748c319395564a0ffb413e1a13726c60ef4;hpb=73192bc1a7ea55fa1864dc3826845b15c00dd2ec;p=ardour.git

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index aad56748c3..556f6e0c2a 100644
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -17,6 +17,9 @@
 */
 
 #include <cassert>
+
+#include "pbd/stacktrace.h"
+
 #include "ardour/audio_port.h"
 #include "ardour/audioengine.h"
 #include "ardour/data_type.h"
@@ -25,8 +28,6 @@
 using namespace ARDOUR;
 using namespace std;
 
-framecnt_t AudioPort::_port_offset = 0;
-
 AudioPort::AudioPort (const std::string& name, Flags flags)
 	: Port (name, DataType::AUDIO, flags)
 	, _buffer (new AudioBuffer (0))
@@ -44,22 +45,9 @@ AudioPort::cycle_start (pframes_t nframes)
 {
 	/* caller must hold process lock */
 
-	/* get_buffer() must only be run on outputs here in cycle_start().
-
-	   Inputs must be done in the correct processing order, which
-	   requires interleaving with route processing. that will
-	   happen when Port::get_buffer() is called.
-	*/
+        Port::cycle_start (nframes);
 
 	if (sends_output()) {
-
-		/* Notice that cycle_start() is always run with the *entire* process cycle frame count,
-		   so we do not bother to apply _port_offset here - we always want the address of the
-		   entire JACK port buffer. We are not collecting data here - just noting the
-		   address where we will write data later in the process cycle.
-		*/
-
-		_buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, nframes), nframes);
 		_buffer->prepare ();
 	}
 }
@@ -67,8 +55,13 @@ AudioPort::cycle_start (pframes_t nframes)
 void
 AudioPort::cycle_end (pframes_t nframes)
 {
-	if (sends_output() && !_buffer->written()) {
-		_buffer->silence (nframes);
+        if (sends_output() && !_buffer->written()) {
+                /* we can't use nframes here because the current buffer capacity may
+                   be shorter than the full buffer size if we split the cycle.
+                */
+		if (_buffer->capacity () > 0) {
+			_buffer->silence (_buffer->capacity());
+		}
 	}
 }
 
@@ -78,30 +71,13 @@ AudioPort::cycle_split ()
 }
 
 AudioBuffer&
-AudioPort::get_audio_buffer (framecnt_t nframes, framecnt_t offset)
+AudioPort::get_audio_buffer (pframes_t nframes)
 {
 	/* caller must hold process lock */
-
-	if (receives_input ()) {
-
-		/* Get a pointer to the audio data @ offset + _port_offset within the JACK port buffer and store
-		   it in our _buffer member.
-
-		   Note that offset is expected to be zero in almost all cases.
-		*/
-
-		_buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, nframes) + offset + _port_offset, nframes);
-	}
-
-	/* output ports set their _buffer data information during ::cycle_start()
-	 */
-
+       _buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, _cycle_nframes) +
+                          _global_port_buffer_offset + _port_buffer_offset, nframes);
 	return *_buffer;
 }
 
-size_t
-AudioPort::raw_buffer_size (pframes_t nframes) const
-{
-	return nframes * sizeof (Sample);
-}
+