try not thinning when loading old-school automation lists
[ardour.git] / libs / ardour / audioengine.cc
index 5f619d8392d26f02c83671870056ae0356fad6b6..7c3beb6c13d795bf8cd26a7b745e95c251766891 100644 (file)
 #include <sstream>
 
 #include <glibmm/timer.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++/jack_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/internal_send.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/process_thread.h"
 #include "ardour/session.h"
-#include "ardour/timestamps.h"
-#include "ardour/utils.h"
 
 #include "i18n.h"
 
@@ -83,7 +77,9 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
        _frame_rate = 0;
        _buffer_size = 0;
        _freewheeling = false;
+       _pre_freewheel_mmc_enabled = false;
         _main_thread = 0;
+       port_remove_in_progress = false;
 
        m_meter_thread = 0;
        g_atomic_int_set (&m_meter_exit, 0);
@@ -93,23 +89,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(PanAutomation);
-       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 ()
@@ -147,20 +126,7 @@ _thread_init_callback (void * /*arg*/)
 
        SessionEvent::create_per_thread_pool (X_("Audioengine"), 512);
 
-       MIDI::Port::set_process_thread (pthread_self());
-}
-
-typedef void (*_JackInfoShutdownCallback)(jack_status_t code, const char* reason, void *arg);
-
-static void (*on_info_shutdown)(jack_client_t*, _JackInfoShutdownCallback, void *);
-extern void jack_on_info_shutdown (jack_client_t*, _JackInfoShutdownCallback, void *) __attribute__((weak));
-
-static void check_jack_symbols () __attribute__((constructor));
-
-void check_jack_symbols ()
-{
-       /* use weak linking to see if we really have various late-model JACK function */
-       on_info_shutdown = jack_on_info_shutdown;
+       MIDI::JackMIDIPort::set_process_thread (pthread_self());
 }
 
 static void
@@ -169,6 +135,44 @@ 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 ()
 {
@@ -176,57 +180,28 @@ AudioEngine::start ()
 
        if (!_running) {
 
-               nframes_t blocksize = jack_get_buffer_size (_priv_jack);
+                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;
+               }
 
                if (_session) {
                        BootMessage (_("Connect session to engine"));
-
-                       _session->set_block_size (blocksize);
                        _session->set_frame_rate (jack_get_sample_rate (_priv_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);
                }
 
-               _processed_frames = 0;
-               last_monitor_check = 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 (on_info_shutdown) {
-                        jack_on_info_shutdown (_priv_jack, halted_info, this);
-                } else {
-                        jack_on_shutdown (_priv_jack, halted, this);
+                if (!jack_port_type_get_buffer_size) {
+                       jack_bufsize_callback (jack_get_buffer_size (_priv_jack));
                 }
-               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_callback (_priv_jack, _process_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_xrun_callback (_priv_jack, _xrun_callback, this);
-#ifdef HAVE_JACK_SESSION 
-               if( jack_set_session_callback )
-                   jack_set_session_callback (_priv_jack, _session_callback, this);
-#endif
-               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);
-               }
+               
+               _processed_frames = 0;
+               last_monitor_check = 0;
 
-               jack_set_error_function (ardour_jack_error);
+                set_jack_callbacks ();
 
                if (jack_activate (_priv_jack) == 0) {
                        _running = true;
@@ -235,18 +210,8 @@ AudioEngine::start ()
                } else {
                        // error << _("cannot activate JACK client") << endmsg;
                }
-
-               _raw_buffer_sizes[DataType::AUDIO] = blocksize * sizeof(float);
-
-                jack_port_t* midi_port = jack_port_register (_priv_jack, "m", JACK_DEFAULT_MIDI_TYPE, JackPortIsOutput, 0);
-                if (!midi_port) {
-                        error << _("Cannot create temporary MIDI port to determine MIDI buffer size") << endmsg;
-                } else {
-                        _raw_buffer_sizes[DataType::MIDI] = jack_midi_max_event_size (jack_port_get_buffer(midi_port, blocksize));
-                        jack_port_unregister (_priv_jack, midi_port);
-                }
        }
-
+               
        return _running ? 0 : -1;
 }
 
@@ -261,7 +226,7 @@ AudioEngine::stop (bool forever)
                } else {
                        jack_deactivate (_priv_jack);
                        Stopped(); /* EMIT SIGNAL */
-                       MIDI::Port::JackHalted (); /* EMIT SIGNAL */
+                       MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
                }
        }
 
@@ -274,7 +239,7 @@ AudioEngine::stop (bool forever)
 
 
 bool
-AudioEngine::get_sync_offset (nframes_t& offset) const
+AudioEngine::get_sync_offset (pframes_t& offset) const
 {
 
 #ifdef HAVE_JACK_VIDEO_SUPPORT
@@ -300,14 +265,14 @@ AudioEngine::get_sync_offset (nframes_t& offset) const
 }
 
 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()) {
@@ -345,34 +310,25 @@ AudioEngine::_xrun_callback (void *arg)
 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;
 }
 
-/** 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 (nframes_t nframes, void *arg)
-{
-       return static_cast<AudioEngine *> (arg)->process_callback (nframes);
-}
-
 void*
 AudioEngine::_process_thread (void *arg)
 {
@@ -382,50 +338,93 @@ AudioEngine::_process_thread (void *arg)
 void
 AudioEngine::_freewheel_callback (int onoff, void *arg)
 {
-       static_cast<AudioEngine*>(arg)->_freewheeling = onoff;
+       static_cast<AudioEngine*>(arg)->freewheel_callback (onoff);
+}
+
+void
+AudioEngine::freewheel_callback (int onoff)
+{
+       _freewheeling = onoff;
+
+       if (onoff) {
+               _pre_freewheel_mmc_enabled = MIDI::Manager::instance()->mmc()->send_enabled ();
+               MIDI::Manager::instance()->mmc()->enable_send (false);
+       } else {
+               MIDI::Manager::instance()->mmc()->enable_send (_pre_freewheel_mmc_enabled);
+       }
 }
 
 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
+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::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
-       ae->PortConnectedOrDisconnected (); /* EMIT SIGNAL */
+
+       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);
+
+       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 ();
+       while (i != pr->end() && (port_a == 0 || port_b == 0)) {
+               if (jack_port_a == i->second->jack_port()) {
+                       port_a = i->second;
+               } else if (jack_port_b == i->second->jack_port()) {
+                       port_b = i->second;
+               }
+               ++i;
+       }
+
+       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
-AudioEngine::split_cycle (nframes_t offset)
+AudioEngine::split_cycle (pframes_t offset)
 {
        /* caller must hold process lock */
 
-       AudioPort::increment_port_offset (offset);
+       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 ();
+               i->second->cycle_split ();
        }
 }
 
-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);
@@ -434,32 +433,33 @@ AudioEngine::process_thread ()
 
         while (1) {
                 GET_PRIVATE_JACK_POINTER_RET(_jack,0);
-                jack_nframes_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 (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);
 
+       PT_TIMING_REF;
+       PT_TIMING_CHECK (1);
+
        /// 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 */
 
@@ -469,12 +469,21 @@ AudioEngine::process_callback (nframes_t nframes)
                next_processed_frames = _processed_frames + nframes;
        }
 
-       if (!tm.locked() || _session == 0) {
+       if (!tm.locked()) {
                /* return having done nothing */
                _processed_frames = next_processed_frames;
                return 0;
        }
 
+       if (_session == 0) {
+               if (!_freewheeling) {
+                       MIDI::Manager::instance()->cycle_start(nframes);
+                       MIDI::Manager::instance()->cycle_end();
+               }
+               _processed_frames = next_processed_frames;
+               return 0;
+       }
+
        if (session_remove_pending) {
                /* perform the actual session removal */
                _session = 0;
@@ -486,16 +495,16 @@ AudioEngine::process_callback (nframes_t nframes)
 
        /* tell all relevant objects that we're starting a new cycle */
 
-       Delivery::CycleStart (nframes);
-       AudioPort::set_port_offset (0);
-       InternalReturn::CycleStart (nframes);
+       InternalSend::CycleStart (nframes);
+       Port::set_global_port_buffer_offset (0);
+        Port::set_cycle_framecnt (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);
+               i->second->cycle_start (nframes);
        }
 
        /* test if we are freewheeling and there are freewheel signals connected.
@@ -503,7 +512,7 @@ AudioEngine::process_callback (nframes_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)) {
@@ -511,10 +520,13 @@ AudioEngine::process_callback (nframes_t nframes)
                }
 
        } else {
+               MIDI::Manager::instance()->cycle_start(nframes);
+
                if (_session) {
                        _session->process (nframes);
-
                }
+
+               MIDI::Manager::instance()->cycle_end();
        }
 
        if (_freewheeling) {
@@ -532,15 +544,14 @@ AudioEngine::process_callback (nframes_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->_last_monitor = x;
+                       if (i->second->last_monitor() != (x = i->second->jack_monitoring_input ())) {
+                               i->second->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->second->MonitorInputChanged (x); /* EMIT SIGNAL */
                        }
                }
                last_monitor_check = next_processed_frames;
@@ -552,10 +563,8 @@ AudioEngine::process_callback (nframes_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->second->sends_output()) {
+                               i->second->get_buffer(nframes).silence(nframes);
                        }
                }
        }
@@ -563,21 +572,24 @@ AudioEngine::process_callback (nframes_t nframes)
        // Finalize ports
 
        for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               (*i)->cycle_end (nframes);
+               i->second->cycle_end (nframes);
        }
 
        _processed_frames = next_processed_frames;
+
+       PT_TIMING_CHECK (2);
+       
        return 0;
 }
 
 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);
@@ -596,50 +608,63 @@ 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)
 {
-        bool need_midi_size = true;
-        bool need_audio_size = true;
+        /* 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 {
 
-        /* crude guesses, see below where we try to get the right answers.
+                /* Old version of JACK.
 
-           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.
-         */
+                   These crude guesses, see below where we try to get the right answers.
 
-        _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof (Sample);
-        _raw_buffer_sizes[DataType::MIDI] = nframes * 4 - (nframes/2);
+                   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.
+                */
 
-       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+                _raw_buffer_sizes[DataType::AUDIO] = nframes * sizeof (Sample);
+                _raw_buffer_sizes[DataType::MIDI] = nframes * 4 - (nframes/2);
+        }
 
-                if (need_audio_size && (*i)->type() == DataType::AUDIO) {
-                        _raw_buffer_sizes[DataType::AUDIO] = (*i)->raw_buffer_size (nframes);
-                        need_audio_size = false;
-                }
-                
-                        
-                if (need_midi_size && (*i)->type() == DataType::MIDI) {
-                        _raw_buffer_sizes[DataType::MIDI] = (*i)->raw_buffer_size (nframes);
-                        need_midi_size = false;
-                }
-                
-               (*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->second->reset();
+               }
        }
 
        if (_session) {
@@ -693,19 +718,19 @@ AudioEngine::set_session (Session *s)
        if (_session) {
 
                start_metering_thread ();
-               
-               nframes_t blocksize = jack_get_buffer_size (_jack);
-               
+
+               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);
+                       i->second->cycle_start (blocksize);
                }
-               
+
                _session->process (blocksize);
                _session->process (blocksize);
                _session->process (blocksize);
@@ -714,9 +739,9 @@ 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);
+                       i->second->cycle_end (blocksize);
                }
        }
 }
@@ -757,35 +782,29 @@ AudioEngine::port_registration_failure (const std::string& portname)
        if (p) {
                reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
        } else {
-               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);
+               reason = string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with more ports if you need this many tracks."), PROGRAM_NAME);
        }
 
        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);
+               ps->insert (make_pair (make_port_name_relative (portname), newport));
 
                /* writer goes out of scope, forces update */
 
@@ -802,20 +821,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 */
 
@@ -829,26 +848,23 @@ AudioEngine::unregister_port (Port& port)
        {
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
+               Ports::iterator x = ps->find (make_port_name_relative (port->name()));
 
-               for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
-                       if ((*i) == &port) {
-                               delete *i;
-                               ps->erase (i);
-                               break;
-                       }
+               if (x != ps->end()) {
+                       ps->erase (x);
                }
 
                /* writer goes out of scope, forces update */
        }
 
+       ports.flush ();
+
        return 0;
 }
 
 int
 AudioEngine::connect (const string& source, const string& destination)
 {
-       /* caller must hold process lock */
-
        int ret;
 
        if (!_running) {
@@ -864,8 +880,8 @@ AudioEngine::connect (const string& source, const string& destination)
        string d = make_port_name_non_relative (destination);
 
 
-       Port* src = get_port_by_name_locked (s);
-       Port* dst = get_port_by_name_locked (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);
@@ -890,8 +906,6 @@ AudioEngine::connect (const string& source, const string& destination)
 int
 AudioEngine::disconnect (const string& source, const string& destination)
 {
-       /* caller must hold process lock */
-
        int ret;
 
        if (!_running) {
@@ -906,8 +920,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_locked (s);
-       Port* dst = get_port_by_name_locked (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);
@@ -921,7 +935,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);
 
@@ -934,17 +948,17 @@ AudioEngine::disconnect (Port& port)
                }
        }
 
-       return port.disconnect_all ();
+       return port->disconnect_all ();
 }
 
-ARDOUR::nframes_t
+ARDOUR::framecnt_t
 AudioEngine::frame_rate () const
 {
-       GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+       GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
        if (_frame_rate == 0) {
-         return (_frame_rate = jack_get_sample_rate (_priv_jack));
+               return (_frame_rate = jack_get_sample_rate (_priv_jack));
        } else {
-         return _frame_rate;
+               return _frame_rate;
        }
 }
 
@@ -955,65 +969,70 @@ AudioEngine::raw_buffer_size (DataType t)
        return (s != _raw_buffer_sizes.end()) ? s->second : 0;
 }
 
-ARDOUR::nframes_t
+ARDOUR::pframes_t
 AudioEngine::frames_per_cycle () const
 {
        GET_PRIVATE_JACK_POINTER_RET (_jack,0);
        if (_buffer_size == 0) {
-         return (_buffer_size = jack_get_buffer_size (_jack));
+               return jack_get_buffer_size (_jack);
        } else {
-         return _buffer_size;
+               return _buffer_size;
        }
 }
 
-/** @param name Full name of port (including prefix:)
- *  @return Corresponding Port*, or 0.  This object remains the property of the AudioEngine
- *  so must not be deleted.
+/** @param name Full or short name of port
+ *  @return Corresponding Port or 0.
  */
-Port *
-AudioEngine::get_port_by_name (const string& portname)
-{
-       string s;
-       if (portname.find_first_of (':') == string::npos) {
-               s = make_port_name_non_relative (portname);
-       } else {
-               s = portname;
-       }
 
-       Glib::Mutex::Lock lm (_process_lock);
-       return get_port_by_name_locked (s);
-}
-
-Port *
-AudioEngine::get_port_by_name_locked (const string& portname)
+boost::shared_ptr<Port>
+AudioEngine::get_port_by_name (const string& portname)
 {
-       /* caller must hold process lock */
-
        if (!_running) {
                if (!_has_run) {
-                       fatal << _("get_port_by_name_locked() called before engine was started") << endmsg;
+                       fatal << _("get_port_by_name() called before engine was started") << endmsg;
                        /*NOTREACHED*/
                } else {
-                       return 0;
+                       boost::shared_ptr<Port> ();
                }
        }
 
-       if (portname.substr (0, jack_client_name.length ()) != jack_client_name) {
-               /* not an ardour: port */
-               return 0;
-       }
-
-       std::string const rel = make_port_name_relative (portname);
+        if (!port_is_mine (portname)) {
+                /* not an ardour port */
+                return boost::shared_ptr<Port> ();
+        }
 
        boost::shared_ptr<Ports> pr = ports.reader();
-
-       for (Ports::iterator i = pr->begin(); i != pr->end(); ++i) {
-               if (rel == (*i)->name()) {
-                       return *i;
+       std::string rel = make_port_name_relative (portname);
+       Ports::iterator x = pr->find (rel);
+
+       if (x != pr->end()) {
+               /* its possible that the port was renamed by some 3rd party and
+                  we don't know about it. check for this (the check is quick
+                  and cheap), and if so, rename the port (which will alter
+                  the port map as a side effect).
+               */
+               const std::string check = make_port_name_relative (jack_port_name (x->second->jack_port()));
+               if (check != rel) {
+                       x->second->set_name (check);
                }
+               return x->second;
        }
 
-       return 0;
+        return boost::shared_ptr<Port> ();
+}
+
+void
+AudioEngine::port_renamed (const std::string& old_relative_name, const std::string& new_relative_name)
+{
+       RCUWriter<Ports> writer (ports);
+       boost::shared_ptr<Ports> p = writer.get_copy();
+       Ports::iterator x = p->find (old_relative_name);
+       
+       if (x != p->end()) {
+               boost::shared_ptr<Port> port = x->second;
+               p->erase (x);
+               p->insert (make_pair (new_relative_name, port));
+       }
 }
 
 const char **
@@ -1035,17 +1054,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) {
@@ -1080,7 +1099,7 @@ AudioEngine::halted (void *arg)
 
        if (was_running) {
                ae->Halted(""); /* EMIT SIGNAL */
-               MIDI::Port::JackHalted (); /* EMIT SIGNAL */
+               MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
        }
 }
 
@@ -1116,7 +1135,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);
@@ -1187,12 +1206,6 @@ AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
        get_physical (type, JackPortIsInput, outs);
 }
 
-void
-AudioEngine::update_total_latency (const Port& port)
-{
-       port.recompute_total_latency ();
-}
-
 void
 AudioEngine::transport_stop ()
 {
@@ -1208,10 +1221,9 @@ AudioEngine::transport_start ()
 }
 
 void
-AudioEngine::transport_locate (nframes_t where)
+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);
 }
 
@@ -1244,7 +1256,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;
@@ -1254,31 +1266,45 @@ 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
 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 */
 #ifdef HAVE_JACK_SESSION
        if (! session_uuid.empty())
@@ -1323,7 +1349,7 @@ AudioEngine::disconnect_from_jack ()
        if (_running) {
                _running = false;
                Stopped(); /* EMIT SIGNAL */
-               MIDI::Port::JackHalted (); /* EMIT SIGNAL */
+               MIDI::JackMIDIPort::JackHalted (); /* EMIT SIGNAL */
        }
 
        return 0;
@@ -1348,7 +1374,7 @@ AudioEngine::reconnect_to_jack ()
        boost::shared_ptr<Ports> p = ports.reader ();
 
        for (i = p->begin(); i != p->end(); ++i) {
-               if ((*i)->reestablish ()) {
+               if (i->second->reestablish ()) {
                        break;
                }
        }
@@ -1362,7 +1388,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));
@@ -1371,24 +1397,7 @@ AudioEngine::reconnect_to_jack ()
 
        last_monitor_check = 0;
 
-       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_callback (_priv_jack, _process_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_xrun_callback (_priv_jack, _xrun_callback, this);
-#ifdef HAVE_JACK_SESSION
-       if( jack_set_session_callback )
-           jack_set_session_callback (_priv_jack, _session_callback, this);
-#endif
-       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);
-       }
+        set_jack_callbacks ();
 
        if (jack_activate (_priv_jack) == 0) {
                _running = true;
@@ -1400,7 +1409,7 @@ AudioEngine::reconnect_to_jack ()
        /* re-establish connections */
 
        for (i = p->begin(); i != p->end(); ++i) {
-               (*i)->reconnect ();
+               i->second->reconnect ();
        }
 
        MIDI::Manager::instance()->reconnect ();
@@ -1413,28 +1422,19 @@ AudioEngine::reconnect_to_jack ()
 }
 
 int
-AudioEngine::request_buffer_size (nframes_t nframes)
+AudioEngine::request_buffer_size (pframes_t nframes)
 {
        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
 
        if (nframes == jack_get_buffer_size (_priv_jack)) {
-         return 0;
+                return 0;
        }
-       
-       return jack_set_buffer_size (_priv_jack, nframes);
-}
 
-void
-AudioEngine::update_total_latencies ()
-{
-#ifdef HAVE_JACK_RECOMPUTE_LATENCIES
-       GET_PRIVATE_JACK_POINTER (_jack);
-       jack_recompute_total_latencies (_priv_jack);
-#endif
+       return jack_set_buffer_size (_priv_jack, nframes);
 }
 
 string
-AudioEngine::make_port_name_relative (string portname)
+AudioEngine::make_port_name_relative (string portname) const
 {
        string::size_type len;
        string::size_type n;
@@ -1455,7 +1455,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;
 
@@ -1470,6 +1470,17 @@ AudioEngine::make_port_name_non_relative (string 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
 {
@@ -1483,10 +1494,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;
 }
@@ -1502,3 +1513,47 @@ AudioEngine::_start_process_thread (void* arg)
 
         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::request_jack_monitors_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);
+}
+
+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;
+}