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

diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index e59df0cb03..99a2b60cc3 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -20,7 +20,9 @@
 #ifndef __ardour_port_h__
 #define __ardour_port_h__
 
+#ifdef WAF_BUILD
 #include "libardour-config.h"
+#endif
 
 #include <set>
 #include <string>
@@ -106,7 +108,7 @@ public:
 	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 ();
@@ -121,15 +123,16 @@ 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_samplecnt (pframes_t n) {
-		_cycle_nframes = n;
-	}
+	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;
@@ -138,28 +141,31 @@ 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 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 */
 
-	samplecnt_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