X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fport.h;h=619b8ba0f2dfb729fb2e8242467c4d0454fbca63;hb=94e0a15325278ec26dbeba4990a0e883db859338;hp=37101950d5158dbcd0963d2983a6673fd01efe6b;hpb=8cc2f19926b4dbd2c1e48351b07fe63b844a9271;p=ardour.git

diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 37101950d5..619b8ba0f2 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -25,11 +25,12 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <jack/jack.h>
 #include <boost/utility.hpp>
 #include "pbd/signals.h"
 
 #include "ardour/data_type.h"
+#include "ardour/port_engine.h"
+#include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 
 namespace ARDOUR {
@@ -37,14 +38,9 @@ namespace ARDOUR {
 class AudioEngine;
 class Buffer;
 
-class Port : public boost::noncopyable
+class LIBARDOUR_API Port : public boost::noncopyable
 {
 public:
-	enum Flags {
-		IsInput = JackPortIsInput,
-		IsOutput = JackPortIsOutput,
-	};
-
 	virtual ~Port ();
 
 	static void set_connecting_blocked( bool yn ) {
@@ -59,10 +55,14 @@ public:
 		return _name;
 	}
 
+	/** @return Port human readable name */
+	std::string pretty_name (bool fallback_to_name = false) const;
+	bool set_pretty_name (const std::string&);
+
 	int set_name (std::string const &);
 
 	/** @return flags */
-	Flags flags () const {
+	PortFlags flags () const {
 		return _flags;
 	}
 
@@ -90,24 +90,24 @@ public:
 	virtual int connect (Port *);
 	int disconnect (Port *);
 
-	void ensure_jack_monitors_input (bool);
-	bool jack_monitoring_input () const;
+	void request_input_monitoring (bool);
+	void ensure_input_monitoring (bool);
+	bool monitoring_input () const;
 	int reestablish ();
 	int reconnect ();
-	void request_jack_monitors_input (bool);
 
 	bool last_monitor() const { return _last_monitor; }
 	void set_last_monitor (bool yn) { _last_monitor = yn; }
 
-	jack_port_t* jack_port() const { return _jack_port; }
+	PortEngine::PortHandle port_handle() { return _port_handle; }
 
-	void get_connected_latency_range (jack_latency_range_t& range, bool playback) const;
+	void get_connected_latency_range (LatencyRange& range, bool playback) const;
 
-	void set_private_latency_range (jack_latency_range_t& range, bool playback);
-	const jack_latency_range_t&  private_latency_range (bool playback) const;
+	void set_private_latency_range (LatencyRange& range, bool playback);
+	const LatencyRange&  private_latency_range (bool playback) const;
 
-	void set_public_latency_range (jack_latency_range_t& range, bool playback) const;
-	jack_latency_range_t public_latency_range (bool playback) const;
+	void set_public_latency_range (LatencyRange& range, bool playback) const;
+	LatencyRange public_latency_range (bool playback) const;
 
 	virtual void reset ();
 
@@ -122,10 +122,10 @@ public:
 
 	bool physically_connected () const;
 
-	static void set_engine (AudioEngine *);
-
 	PBD::Signal1<void,bool> MonitorInputChanged;
 	static PBD::Signal2<void,boost::shared_ptr<Port>,boost::shared_ptr<Port> > PostDisconnect;
+	static PBD::Signal0<void> PortDrop;
+	static PBD::Signal0<void> PortSignalDrop;
 
 	static void set_cycle_framecnt (pframes_t n) {
 		_cycle_nframes = n;
@@ -140,11 +140,16 @@ public:
 
 	virtual void increment_port_buffer_offset (pframes_t n);
 
+	virtual XMLNode& get_state (void) const;
+	virtual int set_state (const XMLNode&, int version);
+
+        static std::string state_node_name;
+
 protected:
 
-	Port (std::string const &, DataType, Flags);
+	Port (std::string const &, DataType, PortFlags);
 
-	jack_port_t* _jack_port; ///< JACK port
+        PortEngine::PortHandle _port_handle;
 
 	static bool	  _connecting_blocked;
 	static pframes_t  _global_port_buffer_offset;   /* access only from process() tree */
@@ -152,21 +157,24 @@ protected:
 
 	framecnt_t _port_buffer_offset; /* access only from process() tree */
 
-	jack_latency_range_t _private_playback_latency;
-	jack_latency_range_t _private_capture_latency;
-
-	static AudioEngine* _engine; ///< the AudioEngine
+	LatencyRange _private_playback_latency;
+	LatencyRange _private_capture_latency;
 
 private:
 	std::string _name;  ///< port short name
-	Flags       _flags; ///< flags
+	PortFlags       _flags; ///< flags
 	bool        _last_monitor;
 
 	/** ports that we are connected to, kept so that we can
-	    reconnect to JACK when required
+	    reconnect to the backend when required
 	*/
 	std::set<std::string> _connections;
 
+	void port_connected_or_disconnected (boost::weak_ptr<Port>, boost::weak_ptr<Port>, bool);
+	void signal_drop ();
+	void drop ();
+	PBD::ScopedConnection drop_connection;
+	PBD::ScopedConnection engine_connection;
 };
 
 }