X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Faudio_port.cc;h=240224ea5e5b33112ae3e72f5e6c21ca5851eac8;hb=78c6c9c04a35caf96b2b4c5755668f9d3b91c912;hp=714be28f3409c4c0ce7fe4006fd7621bdb9598ba;hpb=bb457bb960c5bd7ed538f9d31477293415739f68;p=ardour.git

diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc
index 714be28f34..240224ea5e 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,110 +17,74 @@
 */
 
 #include <cassert>
-#include <ardour/audio_port.h>
-#include <ardour/jack_audio_port.h>
-#include <ardour/audioengine.h>
-#include <ardour/data_type.h>
+
+#include "pbd/stacktrace.h"
+
+#include "ardour/audio_buffer.h"
+#include "ardour/audio_port.h"
+#include "ardour/data_type.h"
 
 using namespace ARDOUR;
 using namespace std;
 
-AudioPort::AudioPort (const std::string& name, Flags flags, bool external, nframes_t capacity)
-	: Port (name, flags)
-	, BaseAudioPort (name, flags)
-	, PortFacade (name, flags)
+AudioPort::AudioPort (const std::string& name, Flags flags)
+	: Port (name, DataType::AUDIO, flags)
+	, _buffer (new AudioBuffer (0))
 {
-	if (!external || receives_input()) {
-
-		/* internal-only and input ports need their own buffers.
-		   external output ports use the external port buffer.
-		*/
-
-		_buffer = new AudioBuffer (capacity);
-		_own_buffer = true;
-	}
-
-	if (!external) {
-
-		_ext_port = 0;
-		set_name (name);
+	assert (name.find_first_of (':') == string::npos);
+}
 
-	} else {
-		
-		/* make the JackAudioPort create its own buffer. For input,
-		   we will copy from it during cycle_start(). For output,
-		   we will set up our buffer to point to its buffer, which
-		   will in turn be using the JACK port buffer for data.
-		*/
+AudioPort::~AudioPort ()
+{
+	delete _buffer;
+}
 
-		_ext_port = new JackAudioPort (name, flags, 0);
+void
+AudioPort::cycle_start (pframes_t nframes)
+{
+	/* caller must hold process lock */
 
-		if (sends_output()) {
-			_buffer = &dynamic_cast<JackAudioPort*>(_ext_port)->get_audio_buffer();
-		} 
+        Port::cycle_start (nframes);
 
-		Port::set_name (_ext_port->name());
+	if (sends_output()) {
+		_buffer->prepare ();
 	}
-
-	reset ();
 }
 
-AudioPort::~AudioPort()
+void
+AudioPort::cycle_end (pframes_t)
 {
-	if (_ext_port) {
-		delete _ext_port;
-		_ext_port = 0;
+        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());
+		}
 	}
 }
 
 void
-AudioPort::reset()
+AudioPort::cycle_split ()
 {
-	BaseAudioPort::reset();
-
-	if (_ext_port) {
-		_ext_port->reset ();
-	}
 }
 
-
-void
-AudioPort::cycle_start (nframes_t nframes, nframes_t offset)
+AudioBuffer&
+AudioPort::get_audio_buffer (pframes_t nframes)
 {
 	/* caller must hold process lock */
+	_buffer->set_data ((Sample *) jack_port_get_buffer (_jack_port, _cycle_nframes) +
+			   _global_port_buffer_offset + _port_buffer_offset, nframes);
+	return *_buffer;
+}
 
-	if (_ext_port) {
-		_ext_port->cycle_start (nframes, offset);
-	}
-
-	if (_flags & IsInput) {
-
-		if (_ext_port) {
-			_buffer->read_from (dynamic_cast<BaseAudioPort*>(_ext_port)->get_audio_buffer(), nframes, offset);
+Sample* 
+AudioPort::engine_get_whole_audio_buffer ()
+{
+	/* caller must hold process lock */
+	return (Sample *) jack_port_get_buffer (_jack_port, _cycle_nframes);
+}
 
-			if (!_connections.empty()) {
-				(*_mixdown) (_connections, _buffer, nframes, offset, false);
-			}
 
-		} else {
-		
-			if (_connections.empty()) {
-				_buffer->silence (nframes, offset);
-			} else {
-				(*_mixdown) (_connections, _buffer, nframes, offset, true);
-			}
-		}
 
-	} else {
-		
-		// XXX if we could get the output stage to not purely mix into, but also
-		// to initially overwrite the buffer, we could avoid this silence step.
-		
-		_buffer->silence (nframes, offset);
-	}
-}
 
-void
-AudioPort::cycle_end (nframes_t nframes, nframes_t offset)
-{
-}