Fix a memory leak.

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

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 5897015b273baed20c172da4b1bb1decbf92933d..fe234c593f10283ddd465218f275bade17ec74e6 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;
+pframes_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)
@@ -51,7 +51,12 @@ Port::Port (std::string const & n, DataType t, Flags f)
 
        assert (_name.find_first_of (':') == std::string::npos);
 
+       if (!_engine->connected()) {
+               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, reason is unknown from here\n";
                throw failed_constructor ();
        }
 }
@@ -59,7 +64,9 @@ Port::Port (std::string const & n, DataType t, Flags f)
 /** Port destructor */
 Port::~Port ()
 {
-       jack_port_unregister (_engine->jack (), _jack_port);
+       if (_engine->jack ()) {
+               jack_port_unregister (_engine->jack (), _jack_port);
+       }
 }
 
 /** @return true if this port is connected to anything */
@@ -99,7 +106,8 @@ Port::get_connections (std::vector<std::string> & c) const
                        c.push_back (jc[i]);
                        ++n;
                }
-               free (jc);
+
+               jack_free (jc);
        }
 
        return n;
@@ -108,13 +116,15 @@ Port::get_connections (std::vector<std::string> & c) const
 int
 Port::connect (std::string const & other)
 {
-       /* caller must hold process lock */
-
        std::string const other_shrt = _engine->make_port_name_non_relative (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 {
@@ -131,8 +141,6 @@ Port::connect (std::string const & other)
 int
 Port::disconnect (std::string const & other)
 {
-       /* caller must hold process lock */
-
        std::string const other_shrt = _engine->make_port_name_non_relative (other);
        std::string const this_shrt = _engine->make_port_name_non_relative (_name);
 
@@ -148,7 +156,7 @@ Port::disconnect (std::string const & other)
                _connections.erase (other);
        }
 
-return r;
+        return r;
 }
 
 
@@ -212,7 +220,7 @@ Port::recompute_total_latency () const
 #endif
 }
 
-nframes_t
+framecnt_t
 Port::total_latency () const
 {
        jack_client_t* jack = _engine->jack();
@@ -285,8 +293,30 @@ Port::request_monitor_input (bool yn)
 }
 
 void
-Port::set_latency (nframes_t n)
+Port::set_latency (framecnt_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;
+}
+