do not offer combine operation for MIDI (see comment in libs/ardour/midi_playlist_sou...
[ardour.git] / libs / ardour / audioengine.cc
index 0c36db6b01e5969233f887bf9483b92aa3f81479..d6d3b45d18260d847864bd09df24144b5f402794 100644 (file)
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2002 Paul Davis 
+    Copyright (C) 2002 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <sstream>
 
 #include <glibmm/timer.h>
-#include <pbd/pthread_utils.h>
-#include <pbd/stacktrace.h>
-#include <pbd/unknown_type.h>
-
-#include <midi++/jack.h>
-
-#include <ardour/audioengine.h>
-#include <ardour/buffer.h>
-#include <ardour/port.h>
-#include <ardour/jack_audio_port.h>
-#include <ardour/jack_midi_port.h>
-#include <ardour/midi_port.h>
-#include <ardour/audio_port.h>
-#include <ardour/session.h>
-#include <ardour/cycle_timer.h>
-#include <ardour/utils.h>
-#include <ardour/event_type_map.h>
-#include <ardour/io.h>
-#ifdef VST_SUPPORT
-#include <fst.h>
-#endif
-
-#include <ardour/timestamps.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 "midi++/port.h"
+#include "midi++/mmc.h"
+#include "midi++/manager.h"
+
+#include "ardour/amp.h"
+#include "ardour/audio_port.h"
+#include "ardour/audioengine.h"
+#include "ardour/buffer.h"
+#include "ardour/buffer_set.h"
+#include "ardour/cycle_timer.h"
+#include "ardour/delivery.h"
+#include "ardour/event_type_map.h"
+#include "ardour/internal_return.h"
+#include "ardour/io.h"
+#include "ardour/meter.h"
+#include "ardour/midi_port.h"
+#include "ardour/process_thread.h"
+#include "ardour/port.h"
+#include "ardour/port_set.h"
+#include "ardour/session.h"
+#include "ardour/timestamps.h"
+#include "ardour/utils.h"
 
 #include "i18n.h"
 
@@ -56,44 +64,46 @@ using namespace ARDOUR;
 using namespace PBD;
 
 gint AudioEngine::m_meter_exit;
+AudioEngine* AudioEngine::_instance = 0;
 
-static void 
-ardour_jack_error (const char* msg) 
-{
-       error << "JACK: " << msg << endmsg;
-}
+#define GET_PRIVATE_JACK_POINTER(j)  jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return; }
+#define GET_PRIVATE_JACK_POINTER_RET(j,r) jack_client_t* _priv_jack = (jack_client_t*) (j); if (!_priv_jack) { return r; }
 
-AudioEngine::AudioEngine (string client_name
+AudioEngine::AudioEngine (string client_name, string session_uuid)
        : ports (new Ports)
 {
-       session = 0;
+       _instance = this; /* singleton */
+
        session_remove_pending = false;
        _running = false;
        _has_run = false;
        last_monitor_check = 0;
-       monitor_check_interval = max_frames;
+       monitor_check_interval = INT32_MAX;
        _processed_frames = 0;
        _usecs_per_cycle = 0;
        _jack = 0;
        _frame_rate = 0;
        _buffer_size = 0;
-       _freewheel_thread_registered = false;
        _freewheeling = false;
+        _main_thread = 0;
+       port_remove_in_progress = false;
 
        m_meter_thread = 0;
        g_atomic_int_set (&m_meter_exit, 0);
 
-       if (connect_to_jack (client_name)) {
+       if (connect_to_jack (client_name, session_uuid)) {
                throw NoBackendAvailable ();
        }
 
        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(PanAutomation);
+       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);
@@ -112,12 +122,12 @@ AudioEngine::~AudioEngine ()
        {
                Glib::Mutex::Lock tm (_process_lock);
                session_removed.signal ();
-               
+
                if (_running) {
                        jack_client_close (_jack);
                        _jack = 0;
                }
-               
+
                stop_metering_thread ();
        }
 }
@@ -129,76 +139,109 @@ AudioEngine::jack() const
 }
 
 void
-_thread_init_callback (void *arg)
+_thread_init_callback (void * /*arg*/)
 {
        /* make sure that anybody who needs to know about this thread
           knows about it.
        */
 
-       PBD::notify_gui_about_thread_creation (pthread_self(), X_("Audioengine"), 4096);
-#ifdef WITH_JACK_MIDI
-       MIDI::JACK_MidiPort::set_process_thread (pthread_self());
-#endif // WITH_JACK_MIDI
+       pthread_set_name (X_("audioengine"));
+
+       PBD::notify_gui_about_thread_creation ("gui", pthread_self(), X_("Audioengine"), 4096);
+       PBD::notify_gui_about_thread_creation ("midiui", pthread_self(), X_("Audioengine"), 128);
+
+       SessionEvent::create_per_thread_pool (X_("Audioengine"), 512);
+
+       MIDI::Port::set_process_thread (pthread_self());
+}
+
+static void
+ardour_jack_error (const char* msg)
+{
+       error << "JACK: " << msg << endmsg;
+}
+
+void
+AudioEngine::set_jack_callbacks ()
+{
+       GET_PRIVATE_JACK_POINTER (_jack);
+
+        if (jack_on_info_shutdown) {
+                jack_on_info_shutdown (_priv_jack, halted_info, this);
+        } else {
+                jack_on_shutdown (_priv_jack, halted, 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);
+
+        if (_session && _session->config.get_jack_time_master()) {
+                jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
+        }
+
+#ifdef HAVE_JACK_SESSION 
+        if( jack_set_session_callback)
+                jack_set_session_callback (_priv_jack, _session_callback, this);
+#endif
+
+        if (jack_set_latency_callback) {
+                jack_set_latency_callback (_priv_jack, _latency_callback, this);
+        }
+
+        jack_set_error_function (ardour_jack_error);
 }
 
 int
 AudioEngine::start ()
 {
-       if (!_jack) {
-               error << _("AudioEngine::start() called while disconnected from JACK") << endmsg;
-               return -1;
-       }
+       GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
 
        if (!_running) {
 
-               if (session) {
-                       nframes_t blocksize = jack_get_buffer_size (_jack);
+                pframes_t blocksize;
 
-                       BootMessage (_("Connect session to engine"));
+                if (jack_port_type_get_buffer_size) {
+                        blocksize = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_AUDIO_TYPE);
+                } else {
+                        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);
+                }
 
-                       session->set_block_size (blocksize);
-                       session->set_frame_rate (jack_get_sample_rate (_jack));
-
-                       /* page in as much of the session process code as we
-                          can before we really start running.
-                       */
-
-                       session->process (blocksize);
-                       session->process (blocksize);
-                       session->process (blocksize);
-                       session->process (blocksize);
-                       session->process (blocksize);
-                       session->process (blocksize);
-                       session->process (blocksize);
-                       session->process (blocksize);
+               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;
 
-               jack_on_shutdown (_jack, halted, this);
-               jack_set_graph_order_callback (_jack, _graph_order_callback, this);
-               jack_set_thread_init_callback (_jack, _thread_init_callback, this);
-               jack_set_process_callback (_jack, _process_callback, this);
-               jack_set_sample_rate_callback (_jack, _sample_rate_callback, this);
-               jack_set_buffer_size_callback (_jack, _bufsize_callback, this);
-               jack_set_xrun_callback (_jack, _xrun_callback, this);
-               jack_set_sync_callback (_jack, _jack_sync_callback, this);
-               jack_set_freewheel_callback (_jack, _freewheel_callback, this);
-
-               if (Config->get_jack_time_master()) {
-                       jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
-               }
+                set_jack_callbacks ();
 
-               if (jack_activate (_jack) == 0) {
+                /* 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_activate (_priv_jack) == 0) {
                        _running = true;
                        _has_run = true;
                        Running(); /* EMIT SIGNAL */
                } else {
                        // error << _("cannot activate JACK client") << endmsg;
                }
-
-               start_metering_thread();
        }
 
        return _running ? 0 : -1;
@@ -207,54 +250,65 @@ AudioEngine::start ()
 int
 AudioEngine::stop (bool forever)
 {
-       if (_jack) {
+       GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+
+       if (_priv_jack) {
                if (forever) {
                        disconnect_from_jack ();
                } else {
-                       jack_deactivate (_jack);
+                       jack_deactivate (_priv_jack);
                        Stopped(); /* EMIT SIGNAL */
+                       MIDI::Port::JackHalted (); /* EMIT SIGNAL */
                }
        }
 
+        if (forever) {
+                stop_metering_thread ();
+        }
+
        return _running ? -1 : 0;
 }
 
 
 bool
-AudioEngine::get_sync_offset (nframes_t& offset) const
+AudioEngine::get_sync_offset (pframes_t& offset) const
 {
 
 #ifdef HAVE_JACK_VIDEO_SUPPORT
 
+       GET_PRIVATE_JACK_POINTER_RET (_jack, false);
+
        jack_position_t pos;
-       
-       if (_jack) {
-               (void) jack_transport_query (_jack, &pos);
-               
+
+       if (_priv_jack) {
+               (void) jack_transport_query (_priv_jack, &pos);
+
                if (pos.valid & JackVideoFrameOffset) {
                        offset = pos.video_offset;
                        return true;
                }
        }
-
+#else
+       /* keep gcc happy */
+       offset = 0;
 #endif
 
        return false;
 }
 
 void
-AudioEngine::_jack_timebase_callback (jack_transport_state_t state, nframes_t nframes,
+AudioEngine::_jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
                                      jack_position_t* pos, int new_position, void *arg)
 {
        static_cast<AudioEngine*> (arg)->jack_timebase_callback (state, nframes, pos, new_position);
 }
 
 void
-AudioEngine::jack_timebase_callback (jack_transport_state_t state, nframes_t nframes,
+AudioEngine::jack_timebase_callback (jack_transport_state_t state, pframes_t nframes,
                                     jack_position_t* pos, int new_position)
 {
-       if (_jack && session && session->synced_to_jack()) {
-               session->jack_timebase_callback (state, nframes, pos, new_position);
+       if (_jack && _session && _session->synced_to_jack()) {
+               _session->jack_timebase_callback (state, nframes, pos, new_position);
        }
 }
 
@@ -267,8 +321,8 @@ AudioEngine::_jack_sync_callback (jack_transport_state_t state, jack_position_t*
 int
 AudioEngine::jack_sync_callback (jack_transport_state_t state, jack_position_t* pos)
 {
-       if (_jack && session) {
-               return session->jack_sync_callback (state, pos);
+       if (_jack && _session) {
+               return _session->jack_sync_callback (state, pos);
        }
 
        return true;
@@ -284,11 +338,23 @@ AudioEngine::_xrun_callback (void *arg)
        return 0;
 }
 
+#ifdef HAVE_JACK_SESSION
+void
+AudioEngine::_session_callback (jack_session_event_t *event, void *arg)
+{
+       printf( "helo.... " );
+       AudioEngine* ae = static_cast<AudioEngine*> (arg);
+       if (ae->connected()) {
+               ae->JackSessionEvent ( event ); /* EMIT SIGNAL */
+       }
+}
+#endif
 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;
@@ -300,39 +366,134 @@ AudioEngine::_graph_order_callback (void *arg)
  * @param arg User argument passed by JACK, which will be the AudioEngine*.
  */
 int
-AudioEngine::_process_callback (nframes_t nframes, void *arg)
+AudioEngine::_process_callback (pframes_t nframes, void *arg)
 {
        return static_cast<AudioEngine *> (arg)->process_callback (nframes);
 }
 
+void*
+AudioEngine::_process_thread (void *arg)
+{
+       return static_cast<AudioEngine *> (arg)->process_thread ();
+}
+
 void
 AudioEngine::_freewheel_callback (int onoff, void *arg)
 {
        static_cast<AudioEngine*>(arg)->_freewheeling = onoff;
 }
 
+void
+AudioEngine::_registration_callback (jack_port_id_t /*id*/, int /*reg*/, void* arg)
+{
+       AudioEngine* ae = static_cast<AudioEngine*> (arg);
+
+       if (!ae->port_remove_in_progress) {
+               ae->PortRegisteredOrUnregistered (); /* EMIT SIGNAL */
+       }
+}
+
+void
+AudioEngine::_latency_callback (jack_latency_callback_mode_t mode, void* arg)
+{
+       return static_cast<AudioEngine *> (arg)->jack_latency_callback (mode);
+}
+
+void
+AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
+{
+       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<Ports> pr = ae->ports.reader ();
+       Ports::iterator i = pr->begin ();
+       while (i != pr->end() && (port_a == 0 || port_b == 0)) {
+               if (jack_port_a == (*i)->jack_port()) {
+                       port_a = *i;
+               } else if (jack_port_b == (*i)->jack_port()) {
+                       port_b = *i;
+               }
+               ++i;
+       }
+       
+       ae->PortConnectedOrDisconnected (port_a, port_b, conn == 0 ? false : true); /* EMIT SIGNAL */
+}
+
+void
+AudioEngine::split_cycle (pframes_t offset)
+{
+       /* caller must hold process lock */
+
+       Port::increment_global_port_buffer_offset (offset);
+
+       /* tell all Ports that we're going to start a new (split) cycle */
+
+       boost::shared_ptr<Ports> p = ports.reader();
+
+       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+               (*i)->cycle_split ();
+       }
+}
+
+void*
+AudioEngine::process_thread ()
+{
+        /* JACK doesn't do this for us when we use the wait API 
+         */
+
+        _thread_init_callback (0);
+
+        _main_thread = new ProcessThread;
+
+        while (1) {
+                GET_PRIVATE_JACK_POINTER_RET(_jack,0);
+
+                pframes_t nframes = jack_cycle_wait (_priv_jack);
+
+                if (process_callback (nframes)) {
+                        return 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.
  */
 int
-AudioEngine::process_callback (nframes_t nframes)
+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);
 
        /// The number of frames that will have been processed when we've finished
-       nframes_t next_processed_frames;
-       
+       pframes_t next_processed_frames;
+
        /* handle wrap around of total frames counter */
 
-       if (max_frames - _processed_frames < nframes) {
-               next_processed_frames = nframes - (max_frames - _processed_frames);
+       if (max_framepos - _processed_frames < nframes) {
+               next_processed_frames = nframes - (max_framepos - _processed_frames);
        } else {
                next_processed_frames = _processed_frames + nframes;
        }
 
-       if (!tm.locked() || session == 0) {
+       if (!tm.locked() || _session == 0) {
                /* return having done nothing */
                _processed_frames = next_processed_frames;
                return 0;
@@ -340,37 +501,47 @@ AudioEngine::process_callback (nframes_t nframes)
 
        if (session_remove_pending) {
                /* perform the actual session removal */
-               session = 0;
+               _session = 0;
                session_remove_pending = false;
                session_removed.signal();
                _processed_frames = next_processed_frames;
                return 0;
        }
 
+       /* tell all relevant objects that we're starting a new cycle */
+
+       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 */
+
        boost::shared_ptr<Ports> p = ports.reader();
 
        for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+               (*i)->cycle_start (nframes);
+       }
 
-               /* Only run cycle_start() on output ports, because 
-                  inputs must be done in the correct processing order,
-                  which requires interleaving with route processing.
-               */
+       /* test if we are freewheeling and there are freewheel signals connected.
+           ardour should act normally even when freewheeling unless /it/ is exporting */
 
-               (*i)->cycle_start (nframes, 0);
-       }
 
-       if (_freewheeling) {
-               /* emit the Freewheel signal and stop freewheeling in the event of trouble */
-               if (Freewheel (nframes)) {
-                       jack_set_freewheel (_jack, false);
+       if (_freewheeling && !Freewheel.empty()) {
+               /* emit the Freewheel signal and stop freewheeling in the event of trouble 
+                */
+                boost::optional<int> r = Freewheel (nframes);
+               if (r.get_value_or (0)) {
+                       jack_set_freewheel (_priv_jack, false);
                }
 
        } else {
-               if (session) {
-                       session->process (nframes);
+               if (_session) {
+                       _session->process (nframes);
+
                }
        }
-       
+
        if (_freewheeling) {
                return 0;
        }
@@ -385,13 +556,13 @@ AudioEngine::process_callback (nframes_t nframes)
                boost::shared_ptr<Ports> p = ports.reader();
 
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-                       
+
                        Port *port = (*i);
                        bool x;
-                       
-                       if (port->_last_monitor != (x = port->monitoring_input ())) {
-                               port->_last_monitor = x;
-                               /* XXX I think this is dangerous, due to 
+
+                       if (port->last_monitor() != (x = port->monitoring_input ())) {
+                               port->set_last_monitor (x);
+                               /* XXX I think this is dangerous, due to
                                   a likely mutex in the signal handlers ...
                                */
                                 port->MonitorInputChanged (x); /* EMIT SIGNAL */
@@ -400,25 +571,24 @@ AudioEngine::process_callback (nframes_t nframes)
                last_monitor_check = next_processed_frames;
        }
 
-       if (session->silent()) {
+       if (_session->silent()) {
 
                boost::shared_ptr<Ports> p = ports.reader();
 
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-                       
+
                        Port *port = (*i);
-                       
+
                        if (port->sends_output()) {
-                               port->get_buffer(nframes, 0 ).silence(nframes);
+                               port->get_buffer(nframes).silence(nframes);
                        }
                }
        }
 
-       // Finalize ports (ie write data if necessary)
+       // Finalize ports
 
        for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-
-               (*i)->cycle_end (nframes, 0);
+               (*i)->cycle_end (nframes);
        }
 
        _processed_frames = next_processed_frames;
@@ -426,24 +596,24 @@ AudioEngine::process_callback (nframes_t nframes)
 }
 
 int
-AudioEngine::_sample_rate_callback (nframes_t nframes, void *arg)
+AudioEngine::_sample_rate_callback (pframes_t nframes, void *arg)
 {
        return static_cast<AudioEngine *> (arg)->jack_sample_rate_callback (nframes);
 }
 
 int
-AudioEngine::jack_sample_rate_callback (nframes_t nframes)
+AudioEngine::jack_sample_rate_callback (pframes_t nframes)
 {
        _frame_rate = nframes;
        _usecs_per_cycle = (int) floor ((((double) frames_per_cycle() / nframes)) * 1000000.0);
-       
+
        /* check for monitor input change every 1/10th of second */
 
        monitor_check_interval = nframes / 10;
        last_monitor_check = 0;
-       
-       if (session) {
-               session->set_frame_rate (nframes);
+
+       if (_session) {
+               _session->set_frame_rate (nframes);
        }
 
        SampleRateChanged (nframes); /* EMIT SIGNAL */
@@ -451,27 +621,67 @@ AudioEngine::jack_sample_rate_callback (nframes_t nframes)
        return 0;
 }
 
+void
+AudioEngine::jack_latency_callback (jack_latency_callback_mode_t mode)
+{
+        if (_session) {
+                _session->update_latency (mode == JackPlaybackLatency);
+        }
+}
+
 int
-AudioEngine::_bufsize_callback (nframes_t nframes, void *arg)
+AudioEngine::_bufsize_callback (pframes_t nframes, void *arg)
 {
        return static_cast<AudioEngine *> (arg)->jack_bufsize_callback (nframes);
 }
 
 int
-AudioEngine::jack_bufsize_callback (nframes_t nframes)
+AudioEngine::jack_bufsize_callback (pframes_t nframes)
 {
+        /* if the size has not changed, this should be a no-op */
+
+        if (nframes == _buffer_size) {
+                return 0;
+        }
+
+       GET_PRIVATE_JACK_POINTER_RET (_jack, 1);
+
        _buffer_size = nframes;
        _usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0);
        last_monitor_check = 0;
 
-       boost::shared_ptr<Ports> p = ports.reader();
+        if (jack_port_type_get_buffer_size) {
+                _raw_buffer_sizes[DataType::AUDIO] = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_AUDIO_TYPE);
+                _raw_buffer_sizes[DataType::MIDI] = jack_port_type_get_buffer_size (_priv_jack, JACK_DEFAULT_MIDI_TYPE);
+        } 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 
+                   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);
+        }
 
-       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               (*i)->reset();
+       { 
+               Glib::Mutex::Lock lm (_process_lock);
+               
+               boost::shared_ptr<Ports> p = ports.reader();
+               
+               for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+                       (*i)->reset();
+               }
        }
 
-       if (session) {
-               session->set_block_size (_buffer_size);
+       if (_session) {
+               _session->set_block_size (_buffer_size);
        }
 
        return 0;
@@ -492,7 +702,7 @@ AudioEngine::start_metering_thread ()
 {
        if (m_meter_thread == 0) {
                g_atomic_int_set (&m_meter_exit, 0);
-               m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread),
+               m_meter_thread = Glib::Thread::create (boost::bind (&AudioEngine::meter_thread, this),
                                                       500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
        }
 }
@@ -500,150 +710,140 @@ AudioEngine::start_metering_thread ()
 void
 AudioEngine::meter_thread ()
 {
+       pthread_set_name (X_("meter"));
+
        while (true) {
                Glib::usleep (10000); /* 1/100th sec interval */
                if (g_atomic_int_get(&m_meter_exit)) {
                        break;
                }
-               IO::update_meters ();
+               Metering::Meter ();
        }
 }
 
-void 
+void
 AudioEngine::set_session (Session *s)
 {
        Glib::Mutex::Lock pl (_process_lock);
+       
+       SessionHandlePtr::set_session (s);
 
-       if (!session) {
-
-               session = s;
+       if (_session) {
 
-               nframes_t blocksize = jack_get_buffer_size (_jack);
+               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, 0);
+                       (*i)->cycle_start (blocksize);
                }
-
-               s->process (blocksize);
-               s->process (blocksize);
-               s->process (blocksize);
-               s->process (blocksize);
-               s->process (blocksize);
-               s->process (blocksize);
-               s->process (blocksize);
-               s->process (blocksize);
-
+               
+               _session->process (blocksize);
+               _session->process (blocksize);
+               _session->process (blocksize);
+               _session->process (blocksize);
+               _session->process (blocksize);
+               _session->process (blocksize);
+               _session->process (blocksize);
+               _session->process (blocksize);
+               
                for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-                       (*i)->cycle_end (blocksize, 0);
+                       (*i)->cycle_end (blocksize);
                }
        }
-}
+} 
 
-void 
+void
 AudioEngine::remove_session ()
 {
        Glib::Mutex::Lock lm (_process_lock);
 
        if (_running) {
 
-               if (session) {
+               stop_metering_thread ();
+
+               if (_session) {
                        session_remove_pending = true;
                        session_removed.wait(_process_lock);
                }
 
        } else {
-               session = 0;
+               SessionHandlePtr::set_session (0);
        }
-       
-       //FIXME: Preliminary bugfix for  http://tracker.ardour.org/view.php?id=1985
-       //remove_all_ports ();
+
+       remove_all_ports ();
 }
 
 void
 AudioEngine::port_registration_failure (const std::string& portname)
 {
+       GET_PRIVATE_JACK_POINTER (_jack);
        string full_portname = jack_client_name;
        full_portname += ':';
        full_portname += portname;
-       
-       
-       jack_port_t* p = jack_port_by_name (_jack, full_portname.c_str());
+
+
+       jack_port_t* p = jack_port_by_name (_priv_jack, full_portname.c_str());
        string reason;
-       
+
        if (p) {
-               reason = _("a port with this name already exists: check for duplicated track/bus names");
+               reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
        } else {
-               reason = _("unknown error");
+               reason = string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with ports if you need this many tracks."), PROGRAM_NAME);
        }
-       
+
        throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
-}      
+}
 
-Port *
-AudioEngine::register_port (DataType dtype, const string& portname, bool input, bool publish)
+Port*
+AudioEngine::register_port (DataType dtype, const string& portname, bool input)
 {
-       Port* newport = 0;
+       Port* newport;
 
-       /*cerr << "trying to register port with name " << portname << endl;*/
        try {
                if (dtype == DataType::AUDIO) {
-                       newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
+                       newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput));
                } else if (dtype == DataType::MIDI) {
-                       newport = new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
+                       newport = new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput));
                } else {
-                       throw unknown_type();
+                       throw PortRegistrationFailure("unable to create port (unknown type)");
                }
 
-               /*cerr << "successfully got port " << portname << " with address " << newport << endl;*/
-
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
-               /*cerr << "Address of ports list: " << ps << endl
-                    << "Ports set size before insert: " << ps->size() << endl;*/
                ps->insert (ps->begin(), newport);
-               /*cerr << "Ports set size after insert: " << ps->size() << endl;*/
 
                /* writer goes out of scope, forces update */
 
                return newport;
        }
 
-       catch (...) {
-               throw PortRegistrationFailure("unable to create port (unknown type?)");
+       catch (PortRegistrationFailure& err) {
+               throw err;
+       } catch (std::exception& e) {
+               throw PortRegistrationFailure(string_compose(
+                               _("unable to create port: %1"), e.what()).c_str());
+       } catch (...) {
+               throw PortRegistrationFailure("unable to create port (unknown error)");
        }
 }
 
-Port*
-AudioEngine::get_port (const std::string& full_name)
-{
-       boost::shared_ptr<Ports> p = ports.reader();
-       
-       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               //cerr << "comparing port name '" << (*i)->name() << "' with '" << full_name << "'" << endl;
-               if ((*i)->name() == full_name) {
-                       return *i;
-               }
-       }
-       return 0;
-}
-
-
 Port *
-AudioEngine::register_input_port (DataType type, const string& portname, bool publish)
+AudioEngine::register_input_port (DataType type, const string& portname)
 {
-       return register_port (type, portname, true, publish);
+       return register_port (type, portname, true);
 }
 
 Port *
-AudioEngine::register_output_port (DataType type, const string& portname, bool publish)
+AudioEngine::register_output_port (DataType type, const string& portname)
 {
-       return register_port (type, portname, false, publish);
+       return register_port (type, portname, false);
 }
 
 int
@@ -651,45 +851,32 @@ AudioEngine::unregister_port (Port& port)
 {
        /* caller must hold process lock */
 
-       cerr << "about to unregister Port xx  x" << &port << "\n";
-
-       if (!_running) { 
+       if (!_running) {
                /* probably happening when the engine has been halted by JACK,
                   in which case, there is nothing we can do here.
                   */
-               cerr << "not running\n";
                return 0;
        }
 
        {
-               cerr << "before getcopy\n";
-               
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
-               
-               cerr << "Ports set size: " << ps.get()->size() << endl;
 
                for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
-                       cerr << "before delete" << endl;
                        if ((*i) == &port) {
-                               cerr << "About to delete " << &port << endl;
                                delete *i;
                                ps->erase (i);
-                               cerr << "After erasing ports size: " << ps->size();
                                break;
                        }
                }
-               
+
                /* writer goes out of scope, forces update */
        }
-               
-       cerr << "before remove_connections\n";
-       remove_connections_for (port);
 
        return 0;
 }
 
-int 
+int
 AudioEngine::connect (const string& source, const string& destination)
 {
        int ret;
@@ -705,63 +892,32 @@ AudioEngine::connect (const string& source, const string& destination)
 
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
-               
-       //cerr << "Trying to connect source: " << s << " with destination " << d << endl;
-       
-       Port* src = get_port (s);
-       Port* dst = get_port (d);
-
-       if (src && dst) {
 
-               /* both ports are known to us, so do the internal connect stuff */
 
-               if ((ret = src->connect (*dst)) == 0) {
-                       ret = dst->connect (*src);
-               }
-
-       } else if (src || dst) {
-
-               /* one port is known to us, try to connect it to something external */
-
-               PortConnectableByName* pcn;
-               string other;
-
-               if (src) {
-                       pcn = dynamic_cast<PortConnectableByName*>(src);
-                       other = d;
-               } else {
-                       pcn = dynamic_cast<PortConnectableByName*>(dst);
-                       other = s;
-               }
-
-               if (pcn) {
-                       ret = pcn->connect (other);
-               } else {
-                       ret = -1;
-               }
+       Port* src = get_port_by_name (s);
+       Port* dst = get_port_by_name (d);
 
+       if (src) {
+               ret = src->connect (d);
+       } else if (dst) {
+               ret = dst->connect (s);
        } else {
-
                /* neither port is known to us, and this API isn't intended for use as a general patch bay */
-
                ret = -1;
-               
        }
-       
+
        if (ret > 0) {
-               error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"), 
-                                       source, s, destination, d) 
-                     << endmsg;
+               /* already exists - no error, no warning */
        } else if (ret < 0) {
-               error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), 
-                                       source, s, destination, d) 
+               error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"),
+                                       source, s, destination, d)
                      << endmsg;
        }
 
        return ret;
 }
 
-int 
+int
 AudioEngine::disconnect (const string& source, const string& destination)
 {
        int ret;
@@ -774,59 +930,29 @@ AudioEngine::disconnect (const string& source, const string& destination)
                        return -1;
                }
        }
-       
+
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
 
-       //cerr << "trying to disconnect port '" << s << "' from port '" << d << endl;
-       
-       Port* src = get_port (s);
-       Port* dst = get_port (d);
-
-       if (src && dst) {
-
-               /* both ports are known to us, so do the internal connect stuff */
-               
-               if ((ret = src->disconnect (*dst)) == 0) {
-                       ret = dst->disconnect (*src);
-               }
-
-       } else if (src || dst) {
-
-               /* one port is known to us, try to connect it to something external */
-
-
-               PortConnectableByName* pcn;
-               string other;
-
-               if (src) {
-                       pcn = dynamic_cast<PortConnectableByName*>(src);
-                       other = d;
-               } else {
-                       pcn = dynamic_cast<PortConnectableByName*>(dst);
-                       other = s;
-               }
-
-               if (pcn) {
-                       ret = pcn->disconnect (other);
-               } else {
-                       ret = -1;
-               }
+       Port* src = get_port_by_name (s);
+       Port* dst = get_port_by_name (d);
 
+       if (src) {
+                       ret = src->disconnect (d);
+       } else if (dst) {
+                       ret = dst->disconnect (s);
        } else {
-
                /* neither port is known to us, and this API isn't intended for use as a general patch bay */
-               
                ret = -1;
-               
        }
-       
        return ret;
 }
 
 int
 AudioEngine::disconnect (Port& port)
 {
+       GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
+
        if (!_running) {
                if (!_has_run) {
                        fatal << _("disconnect called before engine was started") << endmsg;
@@ -839,48 +965,42 @@ AudioEngine::disconnect (Port& port)
        return port.disconnect_all ();
 }
 
-ARDOUR::nframes_t
-AudioEngine::frame_rate ()
+ARDOUR::framecnt_t
+AudioEngine::frame_rate () const
 {
-       if (_jack) {
-               if (_frame_rate == 0) {
-                       return (_frame_rate = jack_get_sample_rate (_jack));
-               } else {
-                       return _frame_rate;
-               }
+       GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
+       if (_frame_rate == 0) {
+               return (_frame_rate = jack_get_sample_rate (_priv_jack));
        } else {
-               fatal << X_("programming error: AudioEngine::frame_rate() called while disconnected from JACK")
-                     << endmsg;
-               /*NOTREACHED*/
-               return 0;
+               return _frame_rate;
        }
 }
 
-ARDOUR::nframes_t
-AudioEngine::frames_per_cycle ()
+size_t
+AudioEngine::raw_buffer_size (DataType t)
 {
-       if (_jack) {
-               if (_buffer_size == 0) {
-                       return (_buffer_size = jack_get_buffer_size (_jack));
-               } else {
-                       return _buffer_size;
-               }
+       std::map<DataType,size_t>::const_iterator s = _raw_buffer_sizes.find(t);
+       return (s != _raw_buffer_sizes.end()) ? s->second : 0;
+}
+
+ARDOUR::pframes_t
+AudioEngine::frames_per_cycle () const
+{
+       GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+       if (_buffer_size == 0) {
+               return jack_get_buffer_size (_jack);
        } else {
-               fatal << X_("programming error: AudioEngine::frame_rate() called while disconnected from JACK")
-                     << endmsg;
-               /*NOTREACHED*/
-               return 0;
+               return _buffer_size;
        }
 }
 
-/** Get a port by name.
- * Note this can return NULL, it will NOT create a port if it is not found (any more).
+/** @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.
  */
-Port *
-AudioEngine::get_port_by_name (const string& portname, bool keep)
+Port*
+AudioEngine::get_port_by_name (const string& portname)
 {
-       Glib::Mutex::Lock lm (_process_lock);
-
        if (!_running) {
                if (!_has_run) {
                        fatal << _("get_port_by_name() called before engine was started") << endmsg;
@@ -889,21 +1009,29 @@ AudioEngine::get_port_by_name (const string& portname, bool keep)
                        return 0;
                }
        }
-       
+
+        if (!port_is_mine (portname)) {
+                /* not an ardour port */
+                return 0;
+        }
+
+       std::string const rel = make_port_name_relative (portname);
+
        boost::shared_ptr<Ports> pr = ports.reader();
-       
+
        for (Ports::iterator i = pr->begin(); i != pr->end(); ++i) {
-               if (portname == (*i)->name()) {
-                       return (*i);
+               if (rel == (*i)->name()) {
+                       return *i;
                }
        }
 
-       return 0;
+        return 0;
 }
 
 const char **
 AudioEngine::get_ports (const string& port_name_pattern, const string& type_name_pattern, uint32_t flags)
 {
+       GET_PRIVATE_JACK_POINTER_RET (_jack,0);
        if (!_running) {
                if (!_has_run) {
                        fatal << _("get_ports called before engine was started") << endmsg;
@@ -912,12 +1040,46 @@ AudioEngine::get_ports (const string& port_name_pattern, const string& type_name
                        return 0;
                }
        }
-       return jack_get_ports (_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags);
+       return jack_get_ports (_priv_jack, port_name_pattern.c_str(), type_name_pattern.c_str(), flags);
+}
+
+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) {
+                case JackBackendError:
+                        ae->Halted(reason); /* EMIT SIGNAL */
+                        break;
+                default:
+                        ae->Halted(""); /* EMIT SIGNAL */
+                }
+#else
+                ae->Halted(""); /* EMIT SIGNAL */
+#endif
+        }
 }
 
 void
 AudioEngine::halted (void *arg)
 {
+        cerr << "HALTED by JACK\n";
+
+        /* called from jack shutdown handler  */
+
        AudioEngine* ae = static_cast<AudioEngine *> (arg);
        bool was_running = ae->_running;
 
@@ -926,22 +1088,34 @@ AudioEngine::halted (void *arg)
        ae->_running = false;
        ae->_buffer_size = 0;
        ae->_frame_rate = 0;
+        ae->_jack = 0;
 
        if (was_running) {
-               ae->Halted(); /* EMIT SIGNAL */
+               ae->Halted(""); /* EMIT SIGNAL */
+               MIDI::Port::JackHalted (); /* EMIT SIGNAL */
        }
 }
 
+void
+AudioEngine::died ()
+{
+        /* called from a signal handler for SIGPIPE */
+
+       stop_metering_thread ();
+
+        _running = false;
+       _buffer_size = 0;
+       _frame_rate = 0;
+       _jack = 0;
+}
+
 bool
-AudioEngine::can_request_hardware_monitoring () 
+AudioEngine::can_request_hardware_monitoring ()
 {
+       GET_PRIVATE_JACK_POINTER_RET (_jack,false);
        const char ** ports;
 
-       if (!_jack) {
-               return 0;
-       }
-
-       if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
                return false;
        }
 
@@ -950,320 +1124,238 @@ AudioEngine::can_request_hardware_monitoring ()
        return true;
 }
 
-
-uint32_t
-AudioEngine::n_physical_outputs (DataType type) const
+ChanCount
+AudioEngine::n_physical (unsigned long flags) const
 {
-       const char ** ports;
-       uint32_t i = 0;
+       ChanCount c;
+       
+       GET_PRIVATE_JACK_POINTER_RET (_jack, c);
 
-       if (!_jack) {
-               return 0;
+       const char ** ports = jack_get_ports (_priv_jack, NULL, NULL, JackPortIsPhysical | flags);
+       if (ports == 0) {
+               return c;
        }
 
-       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
-               return 0;
+       for (uint32_t i = 0; ports[i]; ++i) {
+               if (!strstr (ports[i], "Midi-Through")) {
+                       DataType t (jack_port_type (jack_port_by_name (_jack, ports[i])));
+                       c.set (t, c.get (t) + 1);
+               }
        }
 
-       for (i = 0; ports[i]; ++i);
        free (ports);
 
-       return i;
+       return c;
 }
 
-uint32_t
-AudioEngine::n_physical_inputs (DataType type) const
+ChanCount
+AudioEngine::n_physical_inputs () const
 {
-       const char ** ports;
-       uint32_t i = 0;
-       
-       if (!_jack) {
-               return 0;
-       }
-       
-       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
-               return 0;
-       }
-
-       if (ports) {
-               for (i = 0; ports[i]; ++i);
-               free (ports);
-       }
-       return i;
+       return n_physical (JackPortIsInput);
 }
 
-void
-AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
+ChanCount
+AudioEngine::n_physical_outputs () const
 {
-       const char ** ports;
-       uint32_t i = 0;
-       
-       if (!_jack) {
-               return;
-       }
-       
-       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
-               return;
-       }
-
-       if (ports) {
-               for (i = 0; ports[i]; ++i) {
-                       ins.push_back (ports[i]);
-               }
-               free (ports);
-       }
+       return n_physical (JackPortIsOutput);
 }
 
 void
-AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
+AudioEngine::get_physical (DataType type, unsigned long flags, vector<string>& phy)
 {
+       GET_PRIVATE_JACK_POINTER (_jack);
        const char ** ports;
-       uint32_t i = 0;
-       
-       if (!_jack) {
-               return;
-       }
-       
-       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
+
+       if ((ports = jack_get_ports (_priv_jack, NULL, type.to_jack_type(), JackPortIsPhysical | flags)) == 0) {
                return;
        }
 
        if (ports) {
-               for (i = 0; ports[i]; ++i) {
-                       outs.push_back (ports[i]);
+               for (uint32_t i = 0; ports[i]; ++i) {
+                        if (strstr (ports[i], "Midi-Through")) {
+                                continue;
+                        }
+                       phy.push_back (ports[i]);
                }
                free (ports);
        }
 }
 
-string
-AudioEngine::get_nth_physical (DataType type, uint32_t n, int flag)
-{
-       const char ** ports;
-       uint32_t i;
-       string ret;
-
-       assert(type != DataType::NIL);
-
-       if (!_running || !_jack) {
-               if (!_has_run) {
-                       fatal << _("get_nth_physical called before engine was started") << endmsg;
-                       /*NOTREACHED*/
-               } else {
-                       return "";
-               }
-       }
-
-       ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|flag);
-       
-       if (ports == 0) {
-               return "";
-       }
-
-       for (i = 0; i < n && ports[i]; ++i);
-
-       if (ports[i]) {
-               ret = ports[i];
-       }
-
-       free ((char *) ports);
-
-       return ret;
-}
-
-ARDOUR::nframes_t
-AudioEngine::get_port_total_latency (const Port& port)
+/** Get physical ports for which JackPortIsOutput is set; ie those that correspond to
+ *  a physical input connector.
+ */
+void
+AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
 {
-       return port.total_latency ();
+       get_physical (type, JackPortIsOutput, ins);
 }
 
+/** Get physical ports for which JackPortIsInput is set; ie those that correspond to
+ *  a physical output connector.
+ */
 void
-AudioEngine::update_total_latency (const Port& port)
+AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
 {
-       if (!_jack) {
-               fatal << _("update_total_latency() called with no JACK client connection") << endmsg;
-               /*NOTREACHED*/
-       }
-
-       if (!_running) {
-               if (!_has_run) {
-                       fatal << _("update_total_latency() called before engine was started") << endmsg;
-                       /*NOTREACHED*/
-               } 
-       }
-
-       port.recompute_total_latency ();
+       get_physical (type, JackPortIsInput, outs);
 }
 
 void
 AudioEngine::transport_stop ()
 {
-       if (_jack) {
-               jack_transport_stop (_jack);
-       }
+       GET_PRIVATE_JACK_POINTER (_jack);
+       jack_transport_stop (_priv_jack);
 }
 
 void
 AudioEngine::transport_start ()
 {
-       if (_jack) {
-               jack_transport_start (_jack);
-       }
+       GET_PRIVATE_JACK_POINTER (_jack);
+       jack_transport_start (_priv_jack);
 }
 
 void
-AudioEngine::transport_locate (nframes_t where)
+AudioEngine::transport_locate (framepos_t where)
 {
-       // cerr << "tell JACK to locate to " << where << endl;
-       if (_jack) {
-               jack_transport_locate (_jack, where);
-       }
+       GET_PRIVATE_JACK_POINTER (_jack);
+       jack_transport_locate (_priv_jack, where);
 }
 
 AudioEngine::TransportState
 AudioEngine::transport_state ()
 {
-       if (_jack) {
-               jack_position_t pos;
-               return (TransportState) jack_transport_query (_jack, &pos);
-       } else {
-               return (TransportState) JackTransportStopped;
-       }
+       GET_PRIVATE_JACK_POINTER_RET (_jack, ((TransportState) JackTransportStopped));
+       jack_position_t pos;
+       return (TransportState) jack_transport_query (_priv_jack, &pos);
 }
 
 int
 AudioEngine::reset_timebase ()
 {
-       if (_jack) {
-               if (Config->get_jack_time_master()) {
-                       return jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
+       GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+       if (_session) {
+               if (_session->config.get_jack_time_master()) {
+                       return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
                } else {
                        return jack_release_timebase (_jack);
                }
-       } else {
-               return -1;
        }
+       return 0;
 }
 
 int
 AudioEngine::freewheel (bool onoff)
 {
-       if (_jack) {
-
-               if (onoff != _freewheeling) {
-
-                       if (onoff) {
-                               _freewheel_thread_registered = false;
-                       }
-
-                       return jack_set_freewheel (_jack, onoff);
-
-               } else {
-                       /* already doing what has been asked for */
-                       return 0;
-               }
+       GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
 
+       if (onoff != _freewheeling) {
+                return jack_set_freewheel (_priv_jack, onoff);
+                
        } else {
-               return -1;
+                /* already doing what has been asked for */
+                return 0;
        }
 }
 
 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
+       */
+
+       vector<Port*> to_be_deleted;
 
        {
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
+               for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
+                       to_be_deleted.push_back (*i);
+               }
                ps->clear ();
        }
-}
 
-void
-AudioEngine::remove_connections_for (Port& port)
-{
-       for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ) {
-               PortConnections::iterator tmp;
-               
-               tmp = i;
-               ++tmp;
-               
-               if ((*i).first == port.name()) {
-                       port_connections.erase (i);
-               }
+       /* clear dead wood list in RCU */
 
-               i = tmp;
-       }
-}
+       ports.flush ();
 
+       /* now do the actual deletion, given that "ports" is now empty, thus
+          preventing anyone else from getting a handle on a Port
+       */
+
+       for (vector<Port*>::iterator p = to_be_deleted.begin(); p != to_be_deleted.end(); ++p) {
+               delete *p;
+       }
 
-#ifdef HAVE_JACK_CLIENT_OPEN
+       port_remove_in_progress = false;
+}
 
 int
-AudioEngine::connect_to_jack (string client_name)
+AudioEngine::connect_to_jack (string client_name, string session_uuid)
 {
+        EnvironmentalProtectionAgency* global_epa = EnvironmentalProtectionAgency::get_global_epa ();
+        boost::scoped_ptr<EnvironmentalProtectionAgency> current_epa;
        jack_options_t options = JackNullOption;
        jack_status_t status;
        const char *server_name = NULL;
 
+        /* revert all environment settings back to whatever they were when ardour started
+         */
+
+        if (global_epa) {
+                current_epa.reset (new EnvironmentalProtectionAgency(true)); /* will restore settings when we leave scope */
+                global_epa->restore ();
+        }
+
        jack_client_name = client_name; /* might be reset below */
-       _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
+#ifdef HAVE_JACK_SESSION
+       if (! session_uuid.empty())
+           _jack = jack_client_open (jack_client_name.c_str(), JackSessionID, &status, session_uuid.c_str());
+       else
+#endif
+           _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
 
        if (_jack == NULL) {
                // error message is not useful here
                return -1;
        }
 
+       GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+
        if (status & JackNameNotUnique) {
-               jack_client_name = jack_get_client_name (_jack);
+               jack_client_name = jack_get_client_name (_priv_jack);
        }
 
-       jack_set_error_function (ardour_jack_error);
-       
        return 0;
 }
 
-#else
-
 int
-AudioEngine::connect_to_jack (string client_name)
-{
-       jack_client_name = client_name;
-
-       if ((_jack = jack_client_new (client_name.c_str())) == 0) {
-               return -1;
-       }
-
-       return 0;
-}
-
-#endif /* HAVE_JACK_CLIENT_OPEN */
-
-int 
 AudioEngine::disconnect_from_jack ()
 {
-       if (!_jack) {
-               return 0;
-       }
-
+       GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
 
        if (_running) {
                stop_metering_thread ();
        }
 
-       { 
+       {
                Glib::Mutex::Lock lm (_process_lock);
-               jack_client_close (_jack);
+               jack_client_close (_priv_jack);
                _jack = 0;
        }
 
        _buffer_size = 0;
        _frame_rate = 0;
+       _raw_buffer_sizes.clear();
 
        if (_running) {
                _running = false;
                Stopped(); /* EMIT SIGNAL */
+               MIDI::Port::JackHalted (); /* EMIT SIGNAL */
        }
 
        return 0;
@@ -1278,7 +1370,7 @@ AudioEngine::reconnect_to_jack ()
                Glib::usleep (250000);
        }
 
-       if (connect_to_jack (jack_client_name)) {
+       if (connect_to_jack (jack_client_name, "")) {
                error << _("failed to connect to JACK") << endmsg;
                return -1;
        }
@@ -1290,40 +1382,30 @@ AudioEngine::reconnect_to_jack ()
        for (i = p->begin(); i != p->end(); ++i) {
                if ((*i)->reestablish ()) {
                        break;
-               } 
+               }
        }
 
        if (i != p->end()) {
                /* failed */
                remove_all_ports ();
                return -1;
-       } 
+       }
 
+       GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
 
-       if (session) {
-               session->reset_jack_connection (_jack);
-               nframes_t blocksize = jack_get_buffer_size (_jack);
-               session->set_block_size (blocksize);
-               session->set_frame_rate (jack_get_sample_rate (_jack));
+       MIDI::Manager::instance()->reestablish (_priv_jack);
+       
+       if (_session) {
+               _session->reset_jack_connection (_priv_jack);
+                jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
+               _session->set_frame_rate (jack_get_sample_rate (_priv_jack));
        }
 
        last_monitor_check = 0;
        
-       jack_on_shutdown (_jack, halted, this);
-       jack_set_graph_order_callback (_jack, _graph_order_callback, this);
-       jack_set_thread_init_callback (_jack, _thread_init_callback, this);
-       jack_set_process_callback (_jack, _process_callback, this);
-       jack_set_sample_rate_callback (_jack, _sample_rate_callback, this);
-       jack_set_buffer_size_callback (_jack, _bufsize_callback, this);
-       jack_set_xrun_callback (_jack, _xrun_callback, this);
-       jack_set_sync_callback (_jack, _jack_sync_callback, this);
-       jack_set_freewheel_callback (_jack, _freewheel_callback, this);
-       
-       if (Config->get_jack_time_master()) {
-               jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
-       } 
-       
-       if (jack_activate (_jack) == 0) {
+        set_jack_callbacks ();
+
+       if (jack_activate (_priv_jack) == 0) {
                _running = true;
                _has_run = true;
        } else {
@@ -1331,11 +1413,13 @@ AudioEngine::reconnect_to_jack ()
        }
 
        /* re-establish connections */
-       
+
        for (i = p->begin(); i != p->end(); ++i) {
                (*i)->reconnect ();
        }
 
+       MIDI::Manager::instance()->reconnect ();
+
        Running (); /* EMIT SIGNAL*/
 
        start_metering_thread ();
@@ -1344,37 +1428,30 @@ AudioEngine::reconnect_to_jack ()
 }
 
 int
-AudioEngine::request_buffer_size (nframes_t nframes)
+AudioEngine::request_buffer_size (pframes_t nframes)
 {
-       if (_jack) {
-
-               if (nframes == jack_get_buffer_size (_jack)) {
-                       return 0;
-               }
+       GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
 
-               return jack_set_buffer_size (_jack, nframes);
-
-       } else {
-               return -1;
+       if (nframes == jack_get_buffer_size (_priv_jack)) {
+                return 0;
        }
+       
+       return jack_set_buffer_size (_priv_jack, nframes);
 }
 
 void
 AudioEngine::update_total_latencies ()
 {
-#ifdef HAVE_JACK_RECOMPUTE_LATENCIES
-       if (_jack) {
-               jack_recompute_total_latencies (_jack);
-       }
-#endif
+       GET_PRIVATE_JACK_POINTER (_jack);
+       jack_recompute_total_latencies (_priv_jack);
 }
-               
+
 string
-AudioEngine::make_port_name_relative (string portname)
+AudioEngine::make_port_name_relative (string portname) const
 {
        string::size_type len;
        string::size_type n;
-       
+
        len = portname.length();
 
        for (n = 0; n < len; ++n) {
@@ -1382,7 +1459,7 @@ AudioEngine::make_port_name_relative (string portname)
                        break;
                }
        }
-       
+
        if ((n != len) && (portname.substr (0, n) == jack_client_name)) {
                return portname.substr (n+1);
        }
@@ -1391,7 +1468,7 @@ AudioEngine::make_port_name_relative (string portname)
 }
 
 string
-AudioEngine::make_port_name_non_relative (string portname)
+AudioEngine::make_port_name_non_relative (string portname) const
 {
        string str;
 
@@ -1402,16 +1479,78 @@ AudioEngine::make_port_name_non_relative (string portname)
        str  = jack_client_name;
        str += ':';
        str += portname;
-       
+
        return str;
 }
 
+bool
+AudioEngine::port_is_mine (const string& portname) const
+{
+       if (portname.find_first_of (':') != string::npos) {
+               if (portname.substr (0, jack_client_name.length ()) != jack_client_name) {
+                        return false;
+                }
+        }
+        return true;
+}
+
 bool
 AudioEngine::is_realtime () const
 {
-       if (_jack) {
-               return jack_is_realtime (_jack);
-       } else {
-               return false;
-       }
+       GET_PRIVATE_JACK_POINTER_RET (_jack,false);
+       return jack_is_realtime (_priv_jack);
+}
+
+int
+AudioEngine::create_process_thread (boost::function<void()> f, pthread_t* thread, size_t stacksize)
+{
+        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), 
+                                       jack_is_realtime (_priv_jack), _start_process_thread, td)) {
+                return -1;
+        } 
+
+        return 0;
+}
+
+void*
+AudioEngine::_start_process_thread (void* arg)
+{
+        ThreadData* td = reinterpret_cast<ThreadData*> (arg);
+        boost::function<void()> f = td->f;
+        delete td;
+
+        f ();
+
+        return 0;
+}
+
+bool 
+AudioEngine::port_is_physical (const std::string& portname) const
+{
+        GET_PRIVATE_JACK_POINTER_RET(_jack, false);
+
+        jack_port_t *port = jack_port_by_name (_priv_jack, portname.c_str());
+
+        if (!port) {
+                return false;
+        }
+        
+        return jack_port_flags (port) & JackPortIsPhysical;
+}
+
+void 
+AudioEngine::ensure_monitor_input (const std::string& portname, bool yn) const
+{
+        GET_PRIVATE_JACK_POINTER(_jack);
+
+        jack_port_t *port = jack_port_by_name (_priv_jack, portname.c_str());
+
+        if (!port) {
+                return;
+        }
+
+        jack_port_request_monitor (port, yn);
 }