X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudio_port.h;h=748ef8263baf8c3a8c1ad49f84c1cffcc23c5b65;hb=e5c607123588b318f28022488d74790fc1b7bebe;hp=45949dc59ec46ae06da1ef9435d5a76977ceb441;hpb=30ab1fd61569f9d7fb7410d483fa68cbf9865c37;p=ardour.git

diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h
index 45949dc59e..748ef8263b 100644
--- a/libs/ardour/ardour/audio_port.h
+++ b/libs/ardour/ardour/audio_port.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002-2009 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
@@ -21,90 +21,53 @@
 #ifndef __ardour_audio_port_h__
 #define __ardour_audio_port_h__
 
-#include <sigc++/signal.h>
-#include <pbd/failed_constructor.h>
-#include <ardour/ardour.h>
-#include <jack/jack.h>
-#include <ardour/port.h>
-#include <ardour/buffer.h>
+#include "ardour/port.h"
+#include "ardour/audio_buffer.h"
 
 namespace ARDOUR {
 
-class AudioEngine;
-
-class AudioPort : public Port {
+class AudioPort : public Port
+{
    public:
-	virtual ~AudioPort() { 
-		free (_port);
+	~AudioPort ();
+
+	DataType type () const {
+		return DataType::AUDIO;
 	}
 
-	void cycle_start(jack_nframes_t nframes);
-	void cycle_end();
+	void cycle_start (pframes_t);
+	void cycle_end (pframes_t);
+	void cycle_split ();
 
-	DataType type() const { return DataType(DataType::AUDIO); }
+	size_t raw_buffer_size (pframes_t nframes) const;
 
-	Buffer& get_buffer () {
-		return _buffer;
-	}
-	
-	AudioBuffer& get_audio_buffer() {
-		return _buffer;
+	Buffer& get_buffer (framecnt_t nframes, framecnt_t offset = 0) {
+		return get_audio_buffer (nframes, offset);
 	}
 
-	void reset_overs () {
-		_short_overs = 0;
-		_long_overs = 0;
-		_overlen = 0;
-	}
+	AudioBuffer& get_audio_buffer (framecnt_t nframes, framecnt_t offset = 0);
 
-	void reset_peak_meter () {
-		_peak = 0;
-	}
-	
-	void reset_meters () {
-		reset_peak_meter ();
-		reset_overs ();
-	}
-
-	float                       peak_db() const { return _peak_db; }
-	jack_default_audio_sample_t peak()    const { return _peak; }
+	static framecnt_t port_offset() { return _port_offset; }
 
-	uint32_t short_overs () const { return _short_overs; }
-	uint32_t long_overs ()  const { return _long_overs; }
+	static void set_port_offset (framecnt_t off) {
+		_port_offset = off;
+	}
 	
-	static void set_short_over_length (jack_nframes_t);
-	static void set_long_over_length (jack_nframes_t);
-
-	/** Assumes that the port is an audio output port */
-	void silence (jack_nframes_t nframes, jack_nframes_t offset) {
-		if (!_silent) {
-			_buffer.silence(nframes, offset);
-			if (offset == 0 && nframes == _buffer.capacity()) {
-				_silent = true;
-			}
-		}
+	static void increment_port_offset (framecnt_t n) {
+		_port_offset += n;
 	}
 	
   protected:
 	friend class AudioEngine;
 
-	AudioPort (jack_port_t *port);
-	void reset ();
-	
-	/* engine isn't supposed to access below here */
+	AudioPort (std::string const &, Flags);
 
-	AudioBuffer _buffer;
+  private:
+	AudioBuffer* _buffer;
 
-	jack_nframes_t               _overlen;
-	jack_default_audio_sample_t  _peak;
-	float                        _peak_db;
-	uint32_t                     _short_overs;
-	uint32_t                     _long_overs;
-	
-	static jack_nframes_t        _long_over_length;
-	static jack_nframes_t        _short_over_length;
+	static framecnt_t _port_offset;
 };
- 
+
 } // namespace ARDOUR
 
 #endif /* __ardour_audio_port_h__ */