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

diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h
index 5fb9a7efc3..619b8ba0f2 100644
--- a/libs/ardour/ardour/port.h
+++ b/libs/ardour/ardour/port.h
@@ -25,7 +25,6 @@
 #include <set>
 #include <string>
 #include <vector>
-#include <jack/jack.h>
 #include <boost/utility.hpp>
 #include "pbd/signals.h"
 
@@ -56,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 */
-        PortFlags flags () const {
+	PortFlags flags () const {
 		return _flags;
 	}
 
@@ -96,9 +99,9 @@ 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;
@@ -122,6 +125,7 @@ public:
 	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;
@@ -166,8 +170,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;
 };
 
 }