X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport.cc;h=8bf08a7dff3d25105fdf6786f788372f9dbffb24;hb=c8e3f32533cc6f4481222781d93e7bf7c32ffe5f;hp=d5021026de593cbaa11d378059f20c96ee7eb92e;hpb=28368793415ba934132994d8c10a5e149c1a8d9d;p=ardour.git

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index d5021026de..8bf08a7dff 100644
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2009 Paul Davis 
+    Copyright (C) 2009 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,6 +17,10 @@
 
 */
 
+#ifdef WAF_BUILD
+#include "libardour-config.h"
+#endif
+
 #include "ardour/port.h"
 #include "ardour/audioengine.h"
 #include "pbd/failed_constructor.h"
@@ -32,6 +36,7 @@ using namespace ARDOUR;
 AudioEngine* Port::_engine = 0;
 nframes_t Port::_port_offset = 0;
 nframes_t Port::_buffer_size = 0;
+bool Port::_connecting_blocked = false;
 
 /** @param n Port short name */
 Port::Port (std::string const & n, DataType t, Flags f)
@@ -42,11 +47,11 @@ Port::Port (std::string const & n, DataType t, Flags f)
 
 	/* 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 virtual function type ()
-	   to establish type. 
+	   to establish type.
 	*/
 
 	assert (_name.find_first_of (':') == std::string::npos);
-	
+
 	if ((_jack_port = jack_port_register (_engine->jack (), _name.c_str (), t.to_jack_type (), _flags, 0)) == 0) {
 		throw failed_constructor ();
 	}
@@ -95,8 +100,10 @@ Port::get_connections (std::vector<std::string> & c) const
 			c.push_back (jc[i]);
 			++n;
 		}
+
+		jack_free (jc);
 	}
-	
+
 	return n;
 }
 
@@ -109,13 +116,17 @@ Port::connect (std::string const & other)
 	std::string const this_shrt = _engine->make_port_name_non_relative (_name);
 
 	int r = 0;
-		
+
+	if (_connecting_blocked) {
+		return r;
+	}
+
 	if (sends_output ()) {
 		r = jack_connect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ());
 	} else {
 		r = jack_connect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str());
 	}
-	
+
 	if (r == 0) {
 		_connections.insert (other);
 	}
@@ -132,18 +143,18 @@ Port::disconnect (std::string const & other)
 	std::string const this_shrt = _engine->make_port_name_non_relative (_name);
 
 	int r = 0;
-	
+
 	if (sends_output ()) {
 		r = jack_disconnect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ());
 	} else {
 		r = jack_disconnect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str ());
 	}
-	
+
 	if (r == 0) {
 		_connections.erase (other);
 	}
-	
-return r;
+
+        return r;
 }
 
 
@@ -196,21 +207,40 @@ Port::reset ()
 void
 Port::recompute_total_latency () const
 {
-#ifdef HAVE_JACK_RECOMPUTE_LATENCY	
-	jack_recompute_total_latency (_engine->jack (), _jack_port);
-#endif	
+#ifdef HAVE_JACK_RECOMPUTE_LATENCY
+	jack_client_t* jack = _engine->jack();
+
+	if (!jack) {
+		return;
+	}
+
+	jack_recompute_total_latency (jack, _jack_port);
+#endif
 }
 
 nframes_t
 Port::total_latency () const
 {
-	return jack_port_get_total_latency (_engine->jack (), _jack_port);
+	jack_client_t* jack = _engine->jack();
+
+	if (!jack) {
+		return 0;
+	}
+
+	return jack_port_get_total_latency (jack, _jack_port);
 }
 
 int
 Port::reestablish ()
 {
-	_jack_port = jack_port_register (_engine->jack(), _name.c_str(), type().to_jack_type(), _flags, 0);
+	jack_client_t* jack = _engine->jack();
+
+	if (!jack) {
+		return -1;
+	}
+
+	cerr << "RE-REGISTER: " << _name.c_str() << endl;
+	_jack_port = jack_port_register (jack, _name.c_str(), type().to_jack_type(), _flags, 0);
 
 	if (_jack_port == 0) {
 		PBD::error << string_compose (_("could not reregister %1"), _name) << endmsg;
@@ -237,13 +267,16 @@ Port::reconnect ()
 	return 0;
 }
 
-/** @param n Short name */
+/** @param n Short port name (no JACK client name) */
 int
 Port::set_name (std::string const & n)
 {
-	assert (_name.find_first_of (':') == std::string::npos);
+	if (n == _name) {
+		return 0;
+	}
 
 	int const r = jack_port_set_name (_jack_port, n.c_str());
+
 	if (r == 0) {
 		_name = n;
 	}
@@ -263,3 +296,25 @@ Port::set_latency (nframes_t n)
 	jack_port_set_latency (_jack_port, n);
 }
 
+bool
+Port::physically_connected () const
+{
+	const char** jc = jack_port_get_connections (_jack_port);
+
+	if (jc) {
+		for (int i = 0; jc[i]; ++i) {
+
+                        jack_port_t* port = jack_port_by_name (_engine->jack(), jc[i]);
+                        
+                        if (port && (jack_port_flags (port) & JackPortIsPhysical)) {
+                                jack_free (jc);
+                                return true;
+                        }
+		}
+                
+		jack_free (jc);
+	}
+
+        return false;
+}
+