X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Faudio_port.cc;h=33e41c10ad49cc309615af9d4778e0d5d426b610;hp=23c8ab8335cb520d338210eed427e6435e20dcee;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=f3cf31009a3b52fa126356b6f826958393c6a956

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index 23c8ab8335..33e41c10ad 100644
--- a/libs/ardour/audio_port.cc
+++ b/libs/ardour/audio_port.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,35 +17,78 @@
 */
 
 #include <cassert>
-#include <ardour/audio_port.h>
-#include <ardour/data_type.h>
+
+#include "pbd/stacktrace.h"
+
+#include "ardour/audio_buffer.h"
+#include "ardour/audioengine.h"
+#include "ardour/audio_port.h"
+#include "ardour/data_type.h"
+#include "ardour/port_engine.h"
 
 using namespace ARDOUR;
 using namespace std;
 
-nframes_t AudioPort::_short_over_length = 2;
-nframes_t AudioPort::_long_over_length = 10;
+#define port_engine AudioEngine::instance()->port_engine()
+
+AudioPort::AudioPort (const std::string& name, PortFlags flags)
+	: Port (name, DataType::AUDIO, flags)
+	, _buffer (new AudioBuffer (0))
+{
+	assert (name.find_first_of (':') == string::npos);
+}
+
+AudioPort::~AudioPort ()
+{
+	delete _buffer;
+}
 
-AudioPort::AudioPort()
-	: _buffer (0)
+void
+AudioPort::cycle_start (pframes_t nframes)
 {
-	_type = DataType::AUDIO;
-	reset();
+	/* caller must hold process lock */
+
+        Port::cycle_start (nframes);
+
+	if (sends_output()) {
+		_buffer->prepare ();
+	}
 }
 
 void
-AudioPort::reset()
+AudioPort::cycle_end (pframes_t nframes)
 {
-	Port::reset();
-	if (_flags & IsOutput) {
-		if (_buffer.capacity() > 0) {
-			_buffer.clear();
+        if (sends_output() && !_buffer->written()) {
+	        if (!_buffer->data (0)) {
+		        get_audio_buffer (nframes);
+	        }
+	        if (_buffer->capacity() >= nframes) {
+		        _buffer->silence (nframes);
 		}
-		assert(_buffer.silent());
 	}
-	
-	_metering = 0;
-	reset_meters ();
 }
 
+void
+AudioPort::cycle_split ()
+{
+}
+
+AudioBuffer&
+AudioPort::get_audio_buffer (pframes_t nframes)
+{
+	/* caller must hold process lock */
+	_buffer->set_data ((Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes) +
+			   _global_port_buffer_offset + _port_buffer_offset, nframes);
+	return *_buffer;
+}
+
+Sample*
+AudioPort::engine_get_whole_audio_buffer ()
+{
+	/* caller must hold process lock */
+	return (Sample *) port_engine.get_buffer (_port_handle, _cycle_nframes);
+}
+
+
+