Add some debug code to time things in the process
[ardour.git] / libs / ardour / audioengine.cc
index 44da01defd3d59dcdae7bd48641dea4c3bb4f689..06a1637382ded9ede0c658a5571ad3e0fef8ecd9 100644 (file)
 #include <sstream>
 
 #include <glibmm/timer.h>
-#include <jack/weakjack.h>
-#include <jack/jack.h>
-#include <jack/thread.h>
 
 #include "pbd/pthread_utils.h"
 #include "pbd/stacktrace.h"
 #include "pbd/unknown_type.h"
 #include "pbd/epa.h"
 
+#include <jack/weakjack.h>
+
 #include "midi++/port.h"
 #include "midi++/mmc.h"
 #include "midi++/manager.h"
@@ -86,6 +85,7 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
        _buffer_size = 0;
        _freewheeling = false;
         _main_thread = 0;
+       port_remove_in_progress = false;
 
        m_meter_thread = 0;
        g_atomic_int_set (&m_meter_exit, 0);
@@ -95,25 +95,6 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
        }
 
        Port::set_engine (this);
-
-       // Initialize parameter metadata (e.g. ranges)
-       Evoral::Parameter p(NullAutomation);
-       p = EventTypeMap::instance().new_parameter(NullAutomation);
-       p = EventTypeMap::instance().new_parameter(GainAutomation);
-       p = EventTypeMap::instance().new_parameter(PanAzimuthAutomation);
-       p = EventTypeMap::instance().new_parameter(PanElevationAutomation);
-       p = EventTypeMap::instance().new_parameter(PanWidthAutomation);
-       p = EventTypeMap::instance().new_parameter(PluginAutomation);
-       p = EventTypeMap::instance().new_parameter(SoloAutomation);
-       p = EventTypeMap::instance().new_parameter(MuteAutomation);
-       p = EventTypeMap::instance().new_parameter(MidiCCAutomation);
-       p = EventTypeMap::instance().new_parameter(MidiPgmChangeAutomation);
-       p = EventTypeMap::instance().new_parameter(MidiPitchBenderAutomation);
-       p = EventTypeMap::instance().new_parameter(MidiChannelPressureAutomation);
-       p = EventTypeMap::instance().new_parameter(FadeInAutomation);
-       p = EventTypeMap::instance().new_parameter(FadeOutAutomation);
-       p = EventTypeMap::instance().new_parameter(EnvelopeAutomation);
-       p = EventTypeMap::instance().new_parameter(MidiCCAutomation);
 }
 
 AudioEngine::~AudioEngine ()
@@ -171,22 +152,22 @@ AudioEngine::set_jack_callbacks ()
                 jack_on_shutdown (_priv_jack, halted, this);
         }
 
-        jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this);
         jack_set_thread_init_callback (_priv_jack, _thread_init_callback, this);
         jack_set_process_thread (_priv_jack, _process_thread, this);
         jack_set_sample_rate_callback (_priv_jack, _sample_rate_callback, this);
         jack_set_buffer_size_callback (_priv_jack, _bufsize_callback, this);
+        jack_set_graph_order_callback (_priv_jack, _graph_order_callback, this);
+        jack_set_port_registration_callback (_priv_jack, _registration_callback, this);
+        jack_set_port_connect_callback (_priv_jack, _connect_callback, this);
         jack_set_xrun_callback (_priv_jack, _xrun_callback, this);
         jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
         jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
-        jack_set_port_registration_callback (_priv_jack, _registration_callback, this);
-        jack_set_port_connect_callback (_priv_jack, _connect_callback, this);
-        
+
         if (_session && _session->config.get_jack_time_master()) {
                 jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
         }
 
-#ifdef HAVE_JACK_SESSION 
+#ifdef HAVE_JACK_SESSION
         if( jack_set_session_callback)
                 jack_set_session_callback (_priv_jack, _session_callback, this);
 #endif
@@ -194,7 +175,7 @@ AudioEngine::set_jack_callbacks ()
         if (jack_set_latency_callback) {
                 jack_set_latency_callback (_priv_jack, _latency_callback, this);
         }
-        
+
         jack_set_error_function (ardour_jack_error);
 }
 
@@ -205,34 +186,28 @@ AudioEngine::start ()
 
        if (!_running) {
 
-                pframes_t blocksize;
-
-                if (jack_port_type_get_buffer_size) {
-                        blocksize = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_AUDIO_TYPE);
-                } else {
+                if (!jack_port_type_get_buffer_size) {
                         warning << _("This version of JACK is old - you should upgrade to a newer version that supports jack_port_type_get_buffer_size()") << endmsg;
-                        blocksize = jack_get_buffer_size (_priv_jack);
-                }
+               }
 
                if (_session) {
                        BootMessage (_("Connect session to engine"));
-                       _session->set_block_size (blocksize);
                        _session->set_frame_rate (jack_get_sample_rate (_priv_jack));
                }
 
-               _processed_frames = 0;
-               last_monitor_check = 0;
-
-                set_jack_callbacks ();
-
                 /* a proxy for whether jack_activate() will definitely call the buffer size
                  * callback. with older versions of JACK, this function symbol will be null.
                  * this is reliable, but not clean.
                  */
 
-                if (!jack_port_type_get_buffer_size) { 
-                        jack_bufsize_callback (blocksize);
+                if (!jack_port_type_get_buffer_size) {
+                       jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
                 }
+               
+               _processed_frames = 0;
+               last_monitor_check = 0;
+
+                set_jack_callbacks ();
 
                if (jack_activate (_priv_jack) == 0) {
                        _running = true;
@@ -242,7 +217,7 @@ AudioEngine::start ()
                        // error << _("cannot activate JACK client") << endmsg;
                }
        }
-
+               
        return _running ? 0 : -1;
 }
 
@@ -352,23 +327,14 @@ int
 AudioEngine::_graph_order_callback (void *arg)
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
-       if (ae->connected()) {
+
+       if (ae->connected() && !ae->port_remove_in_progress) {
                ae->GraphReordered (); /* EMIT SIGNAL */
        }
+       
        return 0;
 }
 
-/** Wrapped which is called by JACK as its process callback.  It is just
- * here to get us back into C++ land by calling AudioEngine::process_callback()
- * @param nframes Number of frames passed by JACK.
- * @param arg User argument passed by JACK, which will be the AudioEngine*.
- */
-int
-AudioEngine::_process_callback (pframes_t nframes, void *arg)
-{
-       return static_cast<AudioEngine *> (arg)->process_callback (nframes);
-}
-
 void*
 AudioEngine::_process_thread (void *arg)
 {
@@ -385,7 +351,10 @@ void
 AudioEngine::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* arg)
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
-       ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
+
+       if (!ae->port_remove_in_progress) {
+               ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
+       }
 }
 
 void
@@ -399,13 +368,17 @@ AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int co
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
 
+       if (ae->port_remove_in_progress) {
+               return;
+       }
+
        GET_PRIVATE_JACK_POINTER (ae->_jack);
 
        jack_port_t* jack_port_a = jack_port_by_id (_priv_jack, id_a);
        jack_port_t* jack_port_b = jack_port_by_id (_priv_jack, id_b);
 
-       Port* port_a = 0;
-       Port* port_b = 0;
+       boost::shared_ptr<Port> port_a;
+       boost::shared_ptr<Port> port_b;
 
        boost::shared_ptr<Ports> pr = ae->ports.reader ();
        Ports::iterator i = pr->begin ();
@@ -417,8 +390,12 @@ AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int co
                }
                ++i;
        }
-       
-       ae->PortConnectedOrDisconnected (port_a, port_b, conn == 0 ? false : true); /* EMIT SIGNAL */
+
+       ae->PortConnectedOrDisconnected (
+               port_a, jack_port_name (jack_port_a),
+               port_b, jack_port_name (jack_port_b),
+               conn == 0 ? false : true
+               ); /* EMIT SIGNAL */
 }
 
 void
@@ -437,17 +414,10 @@ AudioEngine::split_cycle (pframes_t offset)
        }
 }
 
-void
-AudioEngine::finish_process_cycle (int /* status*/ )
-{
-        GET_PRIVATE_JACK_POINTER(_jack);
-        jack_cycle_signal (_jack, 0);
-}
-
 void*
 AudioEngine::process_thread ()
 {
-        /* JACK doesn't do this for us when we use the wait API 
+        /* JACK doesn't do this for us when we use the wait API
          */
 
         _thread_init_callback (0);
@@ -456,30 +426,31 @@ AudioEngine::process_thread ()
 
         while (1) {
                 GET_PRIVATE_JACK_POINTER_RET(_jack,0);
-                pframes_t nframes = jack_cycle_wait (_jack);
+
+                pframes_t nframes = jack_cycle_wait (_priv_jack);
 
                 if (process_callback (nframes)) {
-                        cerr << "--- process\n";
                         return 0;
                 }
 
-                finish_process_cycle (0);
+               jack_cycle_signal (_priv_jack, 0);
         }
 
         return 0;
 }
 
-/** Method called by JACK (via _process_callback) which says that there
- * is work to be done.
- * @param nframes Number of frames to process.
+/** Method called by our ::process_thread when there is work to be done.
+ *  @param nframes Number of frames to process.
  */
 int
 AudioEngine::process_callback (pframes_t nframes)
 {
        GET_PRIVATE_JACK_POINTER_RET(_jack,0);
-       // CycleTimer ct ("AudioEngine::process");
        Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);
 
+       PT_TIMING_REF;
+       PT_TIMING_CHECK (1);
+
        /// The number of frames that will have been processed when we've finished
        pframes_t next_processed_frames;
 
@@ -511,7 +482,6 @@ AudioEngine::process_callback (pframes_t nframes)
        Delivery::CycleStart (nframes);
        Port::set_global_port_buffer_offset (0);
         Port::set_cycle_framecnt (nframes);
-       InternalReturn::CycleStart (nframes);
 
        /* tell all Ports that we're starting a new cycle */
 
@@ -526,7 +496,7 @@ AudioEngine::process_callback (pframes_t nframes)
 
 
        if (_freewheeling && !Freewheel.empty()) {
-               /* emit the Freewheel signal and stop freewheeling in the event of trouble 
+               /* emit the Freewheel signal and stop freewheeling in the event of trouble
                 */
                 boost::optional<int> r = Freewheel (nframes);
                if (r.get_value_or (0)) {
@@ -536,7 +506,6 @@ AudioEngine::process_callback (pframes_t nframes)
        } else {
                if (_session) {
                        _session->process (nframes);
-
                }
        }
 
@@ -555,15 +524,14 @@ AudioEngine::process_callback (pframes_t nframes)
 
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
 
-                       Port *port = (*i);
                        bool x;
 
-                       if (port->last_monitor() != (x = port->monitoring_input ())) {
-                               port->set_last_monitor (x);
+                       if ((*i)->last_monitor() != (x = (*i)->jack_monitoring_input ())) {
+                               (*i)->set_last_monitor (x);
                                /* XXX I think this is dangerous, due to
                                   a likely mutex in the signal handlers ...
                                */
-                                port->MonitorInputChanged (x); /* EMIT SIGNAL */
+                               (*i)->MonitorInputChanged (x); /* EMIT SIGNAL */
                        }
                }
                last_monitor_check = next_processed_frames;
@@ -575,10 +543,8 @@ AudioEngine::process_callback (pframes_t nframes)
 
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
 
-                       Port *port = (*i);
-
-                       if (port->sends_output()) {
-                               port->get_buffer(nframes).silence(nframes);
+                       if ((*i)->sends_output()) {
+                               (*i)->get_buffer(nframes).silence(nframes);
                        }
                }
        }
@@ -590,6 +556,9 @@ AudioEngine::process_callback (pframes_t nframes)
        }
 
        _processed_frames = next_processed_frames;
+
+       PT_TIMING_CHECK (2);
+       
        return 0;
 }
 
@@ -654,24 +623,28 @@ AudioEngine::jack_bufsize_callback (pframes_t nframes)
         } else {
 
                 /* Old version of JACK.
-                   
+
                    These crude guesses, see below where we try to get the right answers.
-                   
+
                    Note that our guess for MIDI deliberatey tries to overestimate
                    by a little. It would be nicer if we could get the actual
-                   size from a port, but we have to use this estimate in the 
+                   size from a port, but we have to use this estimate in the
                    event that there are no MIDI ports currently. If there are
                    the value will be adjusted below.
                 */
-                
+
                 _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof (Sample);
                 _raw_buffer_sizes[DataType::MIDI] = nframes * 4 - (nframes/2);
         }
 
-       boost::shared_ptr<Ports> p = ports.reader();
+       {
+               Glib::Mutex::Lock lm (_process_lock);
 
-       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               (*i)->reset();
+               boost::shared_ptr<Ports> p = ports.reader();
+
+               for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+                       (*i)->reset();
+               }
        }
 
        if (_session) {
@@ -725,19 +698,19 @@ AudioEngine::set_session (Session *s)
        if (_session) {
 
                start_metering_thread ();
-               
+
                pframes_t blocksize = jack_get_buffer_size (_jack);
-               
+
                /* page in as much of the session process code as we
                   can before we really start running.
                */
-               
+
                boost::shared_ptr<Ports> p = ports.reader();
-               
+
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
                        (*i)->cycle_start (blocksize);
                }
-               
+
                _session->process (blocksize);
                _session->process (blocksize);
                _session->process (blocksize);
@@ -746,7 +719,7 @@ AudioEngine::set_session (Session *s)
                _session->process (blocksize);
                _session->process (blocksize);
                _session->process (blocksize);
-               
+
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
                        (*i)->cycle_end (blocksize);
                }
@@ -795,26 +768,20 @@ AudioEngine::port_registration_failure (const std::string& portname)
        throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
 }
 
-Port *
+boost::shared_ptr<Port>
 AudioEngine::register_port (DataType dtype, const string& portname, bool input)
 {
-       Port* newport = 0;
+       boost::shared_ptr<Port> newport;
 
        try {
                if (dtype == DataType::AUDIO) {
-                       newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput));
+                       newport.reset (new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput)));
                } else if (dtype == DataType::MIDI) {
-                       newport = new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput));
+                       newport.reset (new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput)));
                } else {
                        throw PortRegistrationFailure("unable to create port (unknown type)");
                }
 
-               size_t& old_buffer_size  = _raw_buffer_sizes[newport->type()];
-               size_t  port_buffer_size = newport->raw_buffer_size(0);
-               if (port_buffer_size > old_buffer_size) {
-                       old_buffer_size = port_buffer_size;
-               }
-
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
                ps->insert (ps->begin(), newport);
@@ -834,20 +801,20 @@ AudioEngine::register_port (DataType dtype, const string& portname, bool input)
        }
 }
 
-Port *
+boost::shared_ptr<Port>
 AudioEngine::register_input_port (DataType type, const string& portname)
 {
        return register_port (type, portname, true);
 }
 
-Port *
+boost::shared_ptr<Port>
 AudioEngine::register_output_port (DataType type, const string& portname)
 {
        return register_port (type, portname, false);
 }
 
 int
-AudioEngine::unregister_port (Port& port)
+AudioEngine::unregister_port (boost::shared_ptr<Port> port)
 {
        /* caller must hold process lock */
 
@@ -861,18 +828,13 @@ AudioEngine::unregister_port (Port& port)
        {
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
-
-               for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
-                       if ((*i) == &port) {
-                               delete *i;
-                               ps->erase (i);
-                               break;
-                       }
-               }
+               ps->erase (port);
 
                /* writer goes out of scope, forces update */
        }
 
+       ports.flush ();
+
        return 0;
 }
 
@@ -894,8 +856,8 @@ AudioEngine::connect (const string& source, const string& destination)
        string d = make_port_name_non_relative (destination);
 
 
-       Port* src = get_port_by_name (s);
-       Port* dst = get_port_by_name (d);
+       boost::shared_ptr<Port> src = get_port_by_name (s);
+       boost::shared_ptr<Port> dst = get_port_by_name (d);
 
        if (src) {
                ret = src->connect (d);
@@ -934,8 +896,8 @@ AudioEngine::disconnect (const string& source, const string& destination)
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
 
-       Port* src = get_port_by_name (s);
-       Port* dst = get_port_by_name (d);
+       boost::shared_ptr<Port> src = get_port_by_name (s);
+       boost::shared_ptr<Port> dst = get_port_by_name (d);
 
        if (src) {
                        ret = src->disconnect (d);
@@ -949,7 +911,7 @@ AudioEngine::disconnect (const string& source, const string& destination)
 }
 
 int
-AudioEngine::disconnect (Port& port)
+AudioEngine::disconnect (boost::shared_ptr<Port> port)
 {
        GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
 
@@ -962,7 +924,7 @@ AudioEngine::disconnect (Port& port)
                }
        }
 
-       return port.disconnect_all ();
+       return port->disconnect_all ();
 }
 
 ARDOUR::framecnt_t
@@ -995,10 +957,10 @@ AudioEngine::frames_per_cycle () const
 }
 
 /** @param name Full or short name of port
- *  @return Corresponding Port*, or 0.  This object remains the property of the AudioEngine
- *  so must not be deleted.
+ *  @return Corresponding Port or 0.
  */
-Port *
+
+boost::shared_ptr<Port>
 AudioEngine::get_port_by_name (const string& portname)
 {
        if (!_running) {
@@ -1006,13 +968,13 @@ AudioEngine::get_port_by_name (const string& portname)
                        fatal << _("get_port_by_name() called before engine was started") << endmsg;
                        /*NOTREACHED*/
                } else {
-                       return 0;
+                       boost::shared_ptr<Port> ();
                }
        }
 
         if (!port_is_mine (portname)) {
                 /* not an ardour port */
-                return 0;
+                return boost::shared_ptr<Port> ();
         }
 
        std::string const rel = make_port_name_relative (portname);
@@ -1025,7 +987,7 @@ AudioEngine::get_port_by_name (const string& portname)
                }
        }
 
-        return 0;
+        return boost::shared_ptr<Port> ();
 }
 
 const char **
@@ -1047,17 +1009,17 @@ void
 AudioEngine::halted_info (jack_status_t code, const char* reason, void *arg)
 {
         /* called from jack shutdown handler  */
-        
+
         AudioEngine* ae = static_cast<AudioEngine *> (arg);
         bool was_running = ae->_running;
-        
+
         ae->stop_metering_thread ();
-        
+
         ae->_running = false;
         ae->_buffer_size = 0;
         ae->_frame_rate = 0;
         ae->_jack = 0;
-        
+
         if (was_running) {
 #ifdef HAVE_JACK_ON_INFO_SHUTDOWN
                 switch (code) {
@@ -1128,7 +1090,7 @@ ChanCount
 AudioEngine::n_physical (unsigned long flags) const
 {
        ChanCount c;
-       
+
        GET_PRIVATE_JACK_POINTER_RET (_jack, c);
 
        const char ** ports = jack_get_ports (_priv_jack, NULL, NULL, JackPortIsPhysical | flags);
@@ -1217,7 +1179,6 @@ void
 AudioEngine::transport_locate (framepos_t where)
 {
        GET_PRIVATE_JACK_POINTER (_jack);
-       // cerr << "tell JACK to locate to " << where << endl;
        jack_transport_locate (_priv_jack, where);
 }
 
@@ -1250,7 +1211,7 @@ AudioEngine::freewheel (bool onoff)
 
        if (onoff != _freewheeling) {
                 return jack_set_freewheel (_priv_jack, onoff);
-                
+
        } else {
                 /* already doing what has been asked for */
                 return 0;
@@ -1260,22 +1221,26 @@ AudioEngine::freewheel (bool onoff)
 void
 AudioEngine::remove_all_ports ()
 {
-       /* process lock MUST be held */
+       /* make sure that JACK callbacks that will be invoked as we cleanup
+        * ports know that they have nothing to do.
+        */
+
+       port_remove_in_progress = true;
+
+       /* process lock MUST be held by caller
+       */
 
        {
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
-
-               for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
-                       delete *i;
-               }
-
                ps->clear ();
        }
 
-       /* clear dead wood list too */
+       /* clear dead wood list in RCU */
 
        ports.flush ();
+
+       port_remove_in_progress = false;
 }
 
 int
@@ -1378,7 +1343,7 @@ AudioEngine::reconnect_to_jack ()
        GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
 
        MIDI::Manager::instance()->reestablish (_priv_jack);
-       
+
        if (_session) {
                _session->reset_jack_connection (_priv_jack);
                 jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
@@ -1419,15 +1384,8 @@ AudioEngine::request_buffer_size (pframes_t nframes)
        if (nframes == jack_get_buffer_size (_priv_jack)) {
                 return 0;
        }
-       
-       return jack_set_buffer_size (_priv_jack, nframes);
-}
 
-void
-AudioEngine::update_total_latencies ()
-{
-       GET_PRIVATE_JACK_POINTER (_jack);
-       jack_recompute_total_latencies (_priv_jack);
+       return jack_set_buffer_size (_priv_jack, nframes);
 }
 
 string
@@ -1491,10 +1449,10 @@ AudioEngine::create_process_thread (boost::function<void()> f, pthread_t* thread
         GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
         ThreadData* td = new ThreadData (this, f, stacksize);
 
-        if (jack_client_create_thread (_priv_jack, thread, jack_client_real_time_priority (_priv_jack), 
+        if (jack_client_create_thread (_priv_jack, thread, jack_client_real_time_priority (_priv_jack),
                                        jack_is_realtime (_priv_jack), _start_process_thread, td)) {
                 return -1;
-        } 
+        }
 
         return 0;
 }
@@ -1511,7 +1469,7 @@ AudioEngine::_start_process_thread (void* arg)
         return 0;
 }
 
-bool 
+bool
 AudioEngine::port_is_physical (const std::string& portname) const
 {
         GET_PRIVATE_JACK_POINTER_RET(_jack, false);
@@ -1521,12 +1479,12 @@ AudioEngine::port_is_physical (const std::string& portname) const
         if (!port) {
                 return false;
         }
-        
+
         return jack_port_flags (port) & JackPortIsPhysical;
 }
 
-void 
-AudioEngine::ensure_monitor_input (const std::string& portname, bool yn) const
+void
+AudioEngine::request_jack_monitors_input (const std::string& portname, bool yn) const
 {
         GET_PRIVATE_JACK_POINTER(_jack);
 
@@ -1538,3 +1496,19 @@ AudioEngine::ensure_monitor_input (const std::string& portname, bool yn) const
 
         jack_port_request_monitor (port, yn);
 }
+
+void
+AudioEngine::update_latencies ()
+{
+        if (jack_recompute_total_latencies) {
+                GET_PRIVATE_JACK_POINTER (_jack);
+                jack_recompute_total_latencies (_priv_jack);
+        }
+}
+
+void
+AudioEngine::destroy ()
+{
+       delete _instance;
+       _instance = 0;
+}