Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 8fadad4fcc91f81e340b039da540db0278c6e5cc..bc5d26fb805431059246f5f29dd46c820ea125d0 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -21,7 +21,9 @@
 #include "libardour-config.h"
 #endif
 
+#ifndef PLATFORM_WINDOWS
 #include <jack/weakjack.h> // so that we can test for new functions at runtime
+#endif
 
 #include "pbd/compose.h"
 #include "pbd/error.h"
@@ -122,7 +124,7 @@ Port::disconnect_all ()
 bool
 Port::connected_to (std::string const & o) const
 {
-       if (!port_engine.connected()) {
+       if (!port_engine.available()) {
                return false;
        }
 
@@ -132,7 +134,7 @@ Port::connected_to (std::string const & o) const
 int
 Port::get_connections (std::vector<std::string> & c) const
 {
-       if (!port_engine.connected()) {
+       if (!port_engine.available()) {
                c.insert (c.end(), _connections.begin(), _connections.end());
                return c.size();
        }
@@ -153,8 +155,10 @@ Port::connect (std::string const & other)
        }
 
        if (sends_output ()) {
+               DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2\n", our_name, other_name));
                r = port_engine.connect (our_name, other_name);
        } else {
+               DEBUG_TRACE (DEBUG::Ports, string_compose ("Connect %1 to %2\n", other_name, our_name));
                r = port_engine.connect (other_name, our_name);
        }
 
@@ -420,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;