X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fport.h;h=99a2b60cc3a6b287b3f5429db3b64e9b1f033c98;hb=21102b45d0d22f2761697b1b9fdfa92aafc25834;hp=5fb9a7efc3bd321213eb112914611fcc28dda76e;hpb=59631acc5f41153a294c97ab820a4b41a886e24c;p=ardour.git

diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 5fb9a7efc3..99a2b60cc3 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -20,12 +20,13 @@
 #ifndef __ardour_port_h__
 #define __ardour_port_h__
 
+#ifdef WAF_BUILD
 #include "libardour-config.h"
+#endif
 
 #include <set>
 #include <string>
 #include <vector>
-#include <jack/jack.h>
 #include <boost/utility.hpp>
 #include "pbd/signals.h"
 
@@ -56,10 +57,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 */
-        PortFlags flags () const {
+	PortFlags flags () const {
 		return _flags;
 	}
 
@@ -96,14 +101,14 @@ public:
 	bool last_monitor() const { return _last_monitor; }
 	void set_last_monitor (bool yn) { _last_monitor = yn; }
 
-        PortEngine::PortHandle port_handle() { return _port_handle; }
+	PortEngine::PortHandle port_handle() { return _port_handle; }
 
-        void get_connected_latency_range (LatencyRange& range, bool playback) const;
+	void get_connected_latency_range (LatencyRange& 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 (LatencyRange& range, bool playback) const;
+	void set_public_latency_range (LatencyRange const& range, bool playback) const;
 	LatencyRange public_latency_range (bool playback) const;
 
 	virtual void reset ();
@@ -118,15 +123,17 @@ public:
 	virtual void realtime_locate () {}
 
 	bool physically_connected () const;
+	bool externally_connected () const;
 
 	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;
-	}
-	static framecnt_t port_offset() { return _global_port_buffer_offset; }
+	static void set_speed_ratio (double s);
+	static void set_cycle_samplecnt (pframes_t n);
+
+	static samplecnt_t port_offset() { return _global_port_buffer_offset; }
 	static void set_global_port_buffer_offset (pframes_t off) {
 		_global_port_buffer_offset = off;
 	}
@@ -134,31 +141,34 @@ public:
 		_global_port_buffer_offset += n;
 	}
 
-	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;
+	static std::string state_node_name;
+
+	static pframes_t cycle_nframes () { return _cycle_nframes; }
+	static double speed_ratio () { return _speed_ratio; }
 
 protected:
 
 	Port (std::string const &, DataType, PortFlags);
 
-        PortEngine::PortHandle _port_handle;
+	PortEngine::PortHandle _port_handle;
 
-	static bool	  _connecting_blocked;
-	static pframes_t  _global_port_buffer_offset;   /* access only from process() tree */
+	static bool	      _connecting_blocked;
 	static pframes_t  _cycle_nframes; /* access only from process() tree */
 
-	framecnt_t _port_buffer_offset; /* access only from process() tree */
+	static pframes_t  _global_port_buffer_offset; /* access only from process() tree */
 
 	LatencyRange _private_playback_latency;
 	LatencyRange _private_capture_latency;
 
+	static double _speed_ratio;
+	static const uint32_t _resampler_quality; /* also latency of the resampler */
+
 private:
 	std::string _name;  ///< port short name
-	PortFlags       _flags; ///< flags
+	PortFlags   _flags; ///< flags
 	bool        _last_monitor;
 
 	/** ports that we are connected to, kept so that we can
@@ -166,8 +176,11 @@ private:
 	*/
 	std::set<std::string> _connections;
 
-       void drop ();
-       PBD::ScopedConnection drop_connection;
+	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;
 };
 
 }