X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudio_port.cc;h=e2bb20dbe958c20753422e202e0d74cf8a911fa8;hb=8de12a40158683c665fc0bf242b2fc150d3ad538;hp=2e3682fe3b43b8d4d6187f82676a4a1e7a871797;hpb=fc9ab1ccbdfc4ae8bdec962e4c9439c1fc59a55f;p=ardour.git

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index 2e3682fe3b..e2bb20dbe9 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,42 +17,75 @@
 */
 
 #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(Flags flags)
-	: Port (flags), _buffer (0)
+AudioPort::AudioPort (const std::string& name, PortFlags flags)
+	: Port (name, DataType::AUDIO, flags)
+	, _buffer (new AudioBuffer (0))
 {
-	_type = DataType::AUDIO;
-	reset();
+	assert (name.find_first_of (':') == string::npos);
 }
 
-AudioPort::AudioPort(Flags flags, nframes_t nframes)
-	: Port (flags), _buffer (nframes)
+AudioPort::~AudioPort ()
 {
-	_type = DataType::AUDIO;
-	reset();
+	delete _buffer;
 }
 
 void
-AudioPort::reset()
+AudioPort::cycle_start (pframes_t nframes)
 {
-	Port::reset();
-	if (_flags & IsOutput) {
-		if (_buffer.capacity() > 0) {
-			_buffer.clear();
+	/* caller must hold process lock */
+
+        Port::cycle_start (nframes);
+
+	if (sends_output()) {
+		_buffer->prepare ();
+	}
+}
+
+void
+AudioPort::cycle_end (pframes_t nframes)
+{
+        if (sends_output() && !_buffer->written()) {
+		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);
+}
+
+
+