missing part of lincoln's patch

[ardour.git] / libs / ardour / port.cc

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 5897015b273baed20c172da4b1bb1decbf92933d..efdd297f5e9bd531f5efa84e28a88f132d6048fc 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -34,8 +34,8 @@ using namespace std;
 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)
@@ -99,7 +99,8 @@ Port::get_connections (std::vector<std::string> & c) const
                        c.push_back (jc[i]);
                        ++n;
                }
-               free (jc);
+
+               jack_free (jc);
        }
 
        return n;
@@ -115,6 +116,10 @@ Port::connect (std::string const & other)
 
        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 {
@@ -148,7 +153,7 @@ Port::disconnect (std::string const & other)
                _connections.erase (other);
        }
 
-return r;
+        return r;
 }
 
 
@@ -290,3 +295,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;
+}
+