X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_port.cc;h=2fecbf9392c1f5b9600da044f0678c9315164d0d;hb=848db8fbd56dbae1ad286b7791dba293462b5f43;hp=f8a1018e2950dfc1661df479717b877c0d07fd76;hpb=665f3bea5a7b145636b6d85bb3623013e38f1819;p=ardour.git

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index f8a1018e29..2fecbf9392 100644
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -20,15 +20,18 @@
 
 #include "pbd/stacktrace.h"
 
-#include "ardour/audio_port.h"
+#include "ardour/audio_buffer.h"
 #include "ardour/audioengine.h"
+#include "ardour/audio_port.h"
 #include "ardour/data_type.h"
-#include "ardour/audio_buffer.h"
+#include "ardour/port_engine.h"
 
 using namespace ARDOUR;
 using namespace std;
 
-AudioPort::AudioPort (const std::string& name, Flags flags)
+#define port_engine AudioEngine::instance()->port_engine()
+
+AudioPort::AudioPort (const std::string& name, PortFlags flags)
 	: Port (name, DataType::AUDIO, flags)
 	, _buffer (new AudioBuffer (0))
 {
@@ -45,6 +48,8 @@ AudioPort::cycle_start (pframes_t nframes)
 {
 	/* caller must hold process lock */
 
+        Port::cycle_start (nframes);
+
 	if (sends_output()) {
 		_buffer->prepare ();
 	}
@@ -54,7 +59,9 @@ void
 AudioPort::cycle_end (pframes_t nframes)
 {
         if (sends_output() && !_buffer->written()) {
-		_buffer->silence (nframes);
+		if (_buffer->capacity() >= nframes) {
+			_buffer->silence (nframes);
+		}
 	}
 }
 
@@ -64,16 +71,21 @@ AudioPort::cycle_split ()
 }
 
 AudioBuffer&
-AudioPort::get_audio_buffer (framecnt_t nframes)
+AudioPort::get_audio_buffer (pframes_t nframes)
 {
 	/* caller must hold process lock */
-       _buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, nframes) + _port_offset, nframes);
+	_buffer->set_data ((Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes) +
+			   _global_port_buffer_offset + _port_buffer_offset, nframes);
 	return *_buffer;
 }
 
-size_t
-AudioPort::raw_buffer_size (pframes_t nframes) const
+Sample* 
+AudioPort::engine_get_whole_audio_buffer ()
 {
-	return nframes * sizeof (Sample);
+	/* caller must hold process lock */
+	return (Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes);
 }
 
+
+
+