attempt to remove confusion and errors caused by unclear semantics of _is_embedded...

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

diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
index 95073806d6a2c3564fa77fee2f582ae240035df1..5897015b273baed20c172da4b1bb1decbf92933d 100644 (file)
--- a/libs/ardour/port.cc
+++ b/libs/ardour/port.cc
@@ -99,6 +99,7 @@ Port::get_connections (std::vector<std::string> & c) const
                        c.push_back (jc[i]);
                        ++n;
                }
+               free (jc);
        }
 
        return n;
@@ -201,21 +202,39 @@ void
 Port::recompute_total_latency () const
 {
 #ifdef HAVE_JACK_RECOMPUTE_LATENCY
-       jack_recompute_total_latency (_engine->jack (), _jack_port);
+       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_client_t* jack = _engine->jack();
+
+       if (!jack) {
+               return -1;
+       }
+
        cerr << "RE-REGISTER: " << _name.c_str() << endl;
-       _jack_port = jack_port_register (_engine->jack(), _name.c_str(), type().to_jack_type(), _flags, 0);
+       _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;