incomplete merge of master into windows (requires upcoming changes to master to be complete)

1 files changed, 125 insertions, 134 deletions

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 0f28b31b57..d8a32e3467 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -32,6 +32,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/debug.h"
 #include "ardour/port.h"
+#include "ardour/port_engine.h"
 
 #include "i18n.h"
 
@@ -42,13 +43,19 @@ using namespace PBD;
 PBD::Signal2<void,boost::shared_ptr<Port>, boost::shared_ptr<Port> > Port::PostDisconnect;
 PBD::Signal0<void> Port::PortDrop;
 
-AudioEngine* Port::_engine = 0;
 bool         Port::_connecting_blocked = false;
 pframes_t    Port::_global_port_buffer_offset = 0;
 pframes_t    Port::_cycle_nframes = 0;
+std::string  Port::state_node_name = X_("Port");
+
+/* a handy define to shorten what would otherwise be a needlessly verbose
+ * repeated phrase
+ */
+#define port_engine AudioEngine::instance()->port_engine()
+#define port_manager AudioEngine::instance()
 
 /** @param n Port short name */
-Port::Port (std::string const & n, DataType t, Flags f)
+Port::Port (std::string const & n, DataType t, PortFlags f)
 	: _port_buffer_offset (0)
 	, _name (n)
 	, _flags (f)
@@ -60,21 +67,17 @@ Port::Port (std::string const & n, DataType t, Flags f)
 	_private_capture_latency.max = 0;
 
 	/* Unfortunately we have to pass the DataType into this constructor so that
-	   we can create the right kind of JACK port; aside from this we'll use the
+	   we can create the right kind of port; aside from this we'll use the
 	   virtual function type () to establish type.
 	*/
 
 	assert (_name.find_first_of (':') == std::string::npos);
 
-	if (!_engine->connected()) {
+	if ((_port_handle = port_engine.register_port (_name, t, _flags)) == 0) {
+		cerr << "Failed to register port \"" << _name << "\", reason is unknown from here\n";
 		throw failed_constructor ();
 	}
-
-	if ((_jack_port = jack_port_register (_engine->jack (), _name.c_str (), t.to_jack_type (), _flags, 0)) == 0) {
-		cerr << "Failed to register JACK port \"" << _name << "\", reason is unknown from here\n";
-		throw failed_constructor ();
-	}
-
+	
 	PortDrop.connect_same_thread (drop_connection, boost::bind (&Port::drop, this));
 }
 
@@ -87,11 +90,10 @@ Port::~Port ()
 void
 Port::drop ()
 {
-	if (_jack_port) {
-		if (_engine->jack ()) {
-			jack_port_unregister (_engine->jack (), _jack_port);
-		}
-		_jack_port = 0;
+	if (_port_handle) {
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("drop handle for port %1\n", name()));
+		port_engine.unregister_port (_port_handle);
+		_port_handle = 0;
 	}
 }
 
@@ -99,18 +101,18 @@ Port::drop ()
 bool
 Port::connected () const
 {
-	return (jack_port_connected (_jack_port) != 0);
+	return (port_engine.connected (_port_handle) != 0);
 }
 
 int
 Port::disconnect_all ()
 {
-	jack_port_disconnect (_engine->jack(), _jack_port);
+	port_engine.disconnect_all (_port_handle);
 	_connections.clear ();
 
 	/* a cheaper, less hacky way to do boost::shared_from_this() ... 
 	 */
-	boost::shared_ptr<Port> pself = _engine->get_port_by_name (name());
+	boost::shared_ptr<Port> pself = port_manager->get_port_by_name (name());
 	PostDisconnect (pself, boost::shared_ptr<Port>()); // emit signal
 
 	return 0;
@@ -122,48 +124,29 @@ Port::disconnect_all ()
 bool
 Port::connected_to (std::string const & o) const
 {
-	if (!_engine->connected()) {
-		/* in some senses, this answer isn't the right one all the time,
-		   because we know about our connections and will re-establish
-		   them when we reconnect to JACK.
-		*/
+	if (!port_engine.connected()) {
 		return false;
 	}
 
-	return jack_port_connected_to (_jack_port,
-	                               _engine->make_port_name_non_relative(o).c_str ());
+	return port_engine.connected_to (_port_handle, AudioEngine::instance()->make_port_name_non_relative (o));
 }
 
-/** @param o Filled in with port full names of ports that we are connected to */
 int
 Port::get_connections (std::vector<std::string> & c) const
 {
-	int n = 0;
-
-	if (_engine->connected()) {
-		const char** jc = jack_port_get_connections (_jack_port);
-		if (jc) {
-			for (int i = 0; jc[i]; ++i) {
-				c.push_back (jc[i]);
-				++n;
-			}
-
-                        if (jack_free) {
-                                jack_free (jc);
-                        } else {
-                                free (jc);
-                        }
-		}
+	if (!port_engine.connected()) {
+		c.insert (c.end(), _connections.begin(), _connections.end());
+		return c.size();
 	}
 
-	return n;
+	return port_engine.get_connections (_port_handle, c);
 }
 
 int
 Port::connect (std::string const & other)
 {
-	std::string const other_shrt = _engine->make_port_name_non_relative (other);
-	std::string const this_shrt = _engine->make_port_name_non_relative (_name);
+	std::string const other_name = AudioEngine::instance()->make_port_name_non_relative (other);
+	std::string const our_name = AudioEngine::instance()->make_port_name_non_relative (_name);
 
 	int r = 0;
 
@@ -172,9 +155,11 @@ Port::connect (std::string const & other)
 	}
 
 	if (sends_output ()) {
-		r = jack_connect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ());
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2\n", our_name, other_name));
+		r = port_engine.connect (our_name, other_name);
 	} else {
-		r = jack_connect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str());
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2\n", other_name, our_name));
+		r = port_engine.connect (other_name, our_name);
 	}
 
 	if (r == 0) {
@@ -187,15 +172,15 @@ Port::connect (std::string const & other)
 int
 Port::disconnect (std::string const & other)
 {
-	std::string const other_fullname = _engine->make_port_name_non_relative (other);
-	std::string const this_fullname = _engine->make_port_name_non_relative (_name);
+	std::string const other_fullname = port_manager->make_port_name_non_relative (other);
+	std::string const this_fullname = port_manager->make_port_name_non_relative (_name);
 
 	int r = 0;
 
 	if (sends_output ()) {
-		r = jack_disconnect (_engine->jack (), this_fullname.c_str (), other_fullname.c_str ());
+		r = port_engine.disconnect (this_fullname, other_fullname);
 	} else {
-		r = jack_disconnect (_engine->jack (), other_fullname.c_str (), this_fullname.c_str ());
+		r = port_engine.disconnect (other_fullname, this_fullname);
 	}
 
 	if (r == 0) {
@@ -204,8 +189,8 @@ Port::disconnect (std::string const & other)
 
 	/* a cheaper, less hacky way to do boost::shared_from_this() ... 
 	 */
-	boost::shared_ptr<Port> pself = _engine->get_port_by_name (name());
-	boost::shared_ptr<Port> pother = _engine->get_port_by_name (other);
+	boost::shared_ptr<Port> pself = AudioEngine::instance()->get_port_by_name (name());
+	boost::shared_ptr<Port> pother = AudioEngine::instance()->get_port_by_name (other);
 
 	if (pself && pother) {
 		/* Disconnecting from another Ardour port: need to allow
@@ -238,21 +223,22 @@ Port::disconnect (Port* o)
 }
 
 void
-Port::set_engine (AudioEngine* e)
+Port::request_input_monitoring (bool yn)
 {
-	_engine = e;
+	port_engine.request_input_monitoring (_port_handle, yn);
 }
 
 void
-Port::ensure_jack_monitors_input (bool yn)
+Port::ensure_input_monitoring (bool yn)
 {
-	jack_port_ensure_monitor (_jack_port, yn);
+	port_engine.ensure_input_monitoring (_port_handle, yn);
 }
 
 bool
-Port::jack_monitoring_input () const
+Port::monitoring_input () const
 {
-	return jack_port_monitoring_input (_jack_port);
+	
+	return port_engine.monitoring_input (_port_handle);
 }
 
 void
@@ -274,28 +260,23 @@ Port::increment_port_buffer_offset (pframes_t nframes)
 }
 
 void
-Port::set_public_latency_range (jack_latency_range_t& range, bool playback) const
+Port::set_public_latency_range (LatencyRange& range, bool playback) const
 {
-	/* this sets the visible latency that the rest of JACK sees. because we do latency
-	   compensation, all (most) of our visible port latency values are identical.
+	/* this sets the visible latency that the rest of the port system
+	   sees. because we do latency compensation, all (most) of our visible
+	   port latency values are identical.
 	*/
 
-	if (!jack_port_set_latency_range) {
-		return;
-	}
-
 	DEBUG_TRACE (DEBUG::Latency,
 	             string_compose ("SET PORT %1 %4 PUBLIC latency now [%2 - %3]\n",
 	                             name(), range.min, range.max,
 	                             (playback ? "PLAYBACK" : "CAPTURE")));;
 
-	jack_port_set_latency_range (_jack_port,
-	                             (playback ? JackPlaybackLatency : JackCaptureLatency),
-	                             &range);
+	port_engine.set_latency_range (_port_handle, playback, range);
 }
 
 void
-Port::set_private_latency_range (jack_latency_range_t& range, bool playback)
+Port::set_private_latency_range (LatencyRange& range, bool playback)
 {
 	if (playback) {
 		_private_playback_latency = range;
@@ -313,12 +294,12 @@ Port::set_private_latency_range (jack_latency_range_t& range, bool playback)
 			             _private_capture_latency.max));
 	}
 
-	/* push to public (JACK) location so that everyone else can see it */
+	/* push to public (port system) location so that everyone else can see it */
 
 	set_public_latency_range (range, playback);
 }
 
-const jack_latency_range_t&
+const LatencyRange&
 Port::private_latency_range (bool playback) const
 {
 	if (playback) {
@@ -338,14 +319,13 @@ Port::private_latency_range (bool playback) const
 	}
 }
 
-jack_latency_range_t
+LatencyRange
 Port::public_latency_range (bool /*playback*/) const
 {
-	jack_latency_range_t r;
+	LatencyRange r;
+
+	r = port_engine.get_latency_range (_port_handle, sends_output() ? true : false);
 
-	jack_port_get_latency_range (_jack_port,
-	                             sends_output() ? JackPlaybackLatency : JackCaptureLatency,
-	                             &r);
 	DEBUG_TRACE (DEBUG::Latency, string_compose (
 		             "GET PORT %1: %4 PUBLIC latency range %2 .. %3\n",
 		             name(), r.min, r.max,
@@ -354,27 +334,15 @@ Port::public_latency_range (bool /*playback*/) const
 }
 
 void
-Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) const
+Port::get_connected_latency_range (LatencyRange& range, bool playback) const
 {
-	if (!jack_port_get_latency_range) {
-		return;
-	}
-
 	vector<string> connections;
-	jack_client_t* jack = _engine->jack();
-
-	if (!jack) {
-		range.min = 0;
-		range.max = 0;
-		PBD::warning << _("get_connected_latency_range() called while disconnected from JACK") << endmsg;
-		return;
-	}
 
 	get_connections (connections);
 
 	if (!connections.empty()) {
 
-		range.min = ~((jack_nframes_t) 0);
+		range.min = ~((pframes_t) 0);
 		range.max = 0;
 
 		DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: %2 connections to check for latency range\n", name(), connections.size()));
@@ -382,21 +350,18 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
 		for (vector<string>::const_iterator c = connections.begin();
 		     c != connections.end(); ++c) {
 
-                        jack_latency_range_t lr;
+                        LatencyRange lr;
 
                         if (!AudioEngine::instance()->port_is_mine (*c)) {
 
-                                /* port belongs to some other JACK client, use
-                                 * JACK to lookup its latency information.
+                                /* port belongs to some other port-system client, use
+                                 * the port engine to lookup its latency information.
                                  */
 
-                                jack_port_t* remote_port = jack_port_by_name (_engine->jack(), (*c).c_str());
+				PortEngine::PortHandle remote_port = port_engine.get_port_by_name (*c);
 
                                 if (remote_port) {
-                                        jack_port_get_latency_range (
-                                                remote_port,
-                                                (playback ? JackPlaybackLatency : JackCaptureLatency),
-                                                &lr);
+                                        lr = port_engine.get_latency_range (remote_port, playback);
 
                                         DEBUG_TRACE (DEBUG::Latency, string_compose (
                                                              "\t%1 <-> %2 : latter has latency range %3 .. %4\n",
@@ -440,15 +405,10 @@ Port::get_connected_latency_range (jack_latency_range_t& range, bool playback) c
 int
 Port::reestablish ()
 {
-	jack_client_t* jack = _engine->jack();
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("re-establish %1 port %2\n", type().to_string(), _name));
+	_port_handle = port_engine.register_port (_name, type(), _flags);
 
-	if (!jack) {
-		return -1;
-	}
-
-	_jack_port = jack_port_register (jack, _name.c_str(), type().to_jack_type(), _flags, 0);
-
-	if (_jack_port == 0) {
+	if (_port_handle == 0) {
 		PBD::error << string_compose (_("could not reregister %1"), _name) << endmsg;
 		return -1;
 	}
@@ -464,6 +424,8 @@ Port::reconnect ()
 {
 	/* caller must hold process lock; intended to be used only after reestablish() */
 
+	DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2 destinations\n",name(), _connections.size()));
+
 	for (std::set<string>::iterator i = _connections.begin(); i != _connections.end(); ++i) {
 		if (connect (*i)) {
 			return -1;
@@ -473,7 +435,7 @@ Port::reconnect ()
 	return 0;
 }
 
-/** @param n Short port name (no JACK client name) */
+/** @param n Short port name (no port-system client name) */
 int
 Port::set_name (std::string const & n)
 {
@@ -481,10 +443,10 @@ Port::set_name (std::string const & n)
 		return 0;
 	}
 
-	int const r = jack_port_set_name (_jack_port, n.c_str());
+	int const r = port_engine.set_port_name (_port_handle, n);
 
 	if (r == 0) {
-		_engine->port_renamed (_name, n);
+		AudioEngine::instance()->port_renamed (_name, n);
 		_name = n;
 	}
 
@@ -492,38 +454,67 @@ Port::set_name (std::string const & n)
 	return r;
 }
 
-void
-Port::request_jack_monitors_input (bool yn)
+bool
+Port::physically_connected () const
 {
-	jack_port_request_monitor (_jack_port, yn);
+	return port_engine.physically_connected (_port_handle);
 }
 
-bool
-Port::physically_connected () const
+XMLNode&
+Port::get_state () const
 {
-	const char** jc = jack_port_get_connections (_jack_port);
+	XMLNode* root = new XMLNode (state_node_name);
 
-	if (jc) {
-		for (int i = 0; jc[i]; ++i) {
+	root->add_property (X_("name"), AudioEngine::instance()->make_port_name_relative (name()));
 
-			jack_port_t* port = jack_port_by_name (_engine->jack(), jc[i]);
+	if (receives_input()) {
+		root->add_property (X_("direction"), X_("input"));
+	} else {
+		root->add_property (X_("direction"), X_("output"));
+	}
 
-			if (port && (jack_port_flags (port) & JackPortIsPhysical)) {
-                                if (jack_free) {
-                                        jack_free (jc);
-                                } else {
-                                        free (jc);
-                                }
-				return true;
-			}
-		}
-                if (jack_free) {
-                        jack_free (jc);
-                } else {
-                        free (jc);
-                }
+	vector<string> c;
+	
+	get_connections (c);
+
+	for (vector<string>::const_iterator i = c.begin(); i != c.end(); ++i) {
+		XMLNode* child = new XMLNode (X_("Connection"));
+		child->add_property (X_("other"), *i);
+		root->add_child_nocopy (*child);
 	}
 
-	return false;
+	return *root;
 }
 
+int
+Port::set_state (const XMLNode& node, int)
+{
+	const XMLProperty* prop;
+
+	if (node.name() != state_node_name) {
+		return -1;
+	}
+
+	if ((prop = node.property (X_("name"))) != 0) {
+		set_name (prop->value());
+	}
+
+	const XMLNodeList& children (node.children());
+
+	_connections.clear ();
+
+	for (XMLNodeList::const_iterator c = children.begin(); c != children.end(); ++c) {
+
+		if ((*c)->name() != X_("Connection")) {
+			continue;
+		}
+		
+		if ((prop = (*c)->property (X_("other"))) == 0) {
+			continue;
+		}
+
+		_connections.insert (prop->value());
+	}
+
+	return 0;
+}