PluginInfo::type added to copy constructor. But why is the copy constructor defined...
[ardour.git] / libs / ardour / audioengine.cc
index c64b4d6429b849bfb3285904877a9c1497047784..ae8d7bf5f5ffd331bf447e30c2232dfec71c0df8 100644 (file)
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <unistd.h>
 #include <cerrno>
 #include <vector>
+#include <sstream>
+
+#include <glibmm/timer.h>
 #include <pbd/pthread_utils.h>
+#include <pbd/stacktrace.h>
 
 #include <ardour/audioengine.h>
+#include <ardour/buffer.h>
 #include <ardour/port.h>
+#include <ardour/io.h>
 #include <ardour/session.h>
 #include <ardour/cycle_timer.h>
 #include <ardour/utils.h>
-#ifdef VST_SUPPORT
-#include <fst.h>
-#endif
 
 #include <ardour/timestamps.h>
 
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
+
+gint AudioEngine::m_meter_exit;
+AudioEngine* AudioEngine::_instance = 0;
 
-jack_nframes_t Port::short_over_length = 2;
-jack_nframes_t Port::long_over_length = 10;
+#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; }
+
+static void 
+ardour_jack_error (const char* msg) 
+{
+       // throw JACK errors away - they cause visual clutter
+       // error << "JACK: " << msg << endmsg;
+}
 
 AudioEngine::AudioEngine (string client_name) 
+       : ports (new Ports)
 {
-       pthread_cond_init (&session_removed, 0);
+       _instance = this; /* singleton */
+
        session = 0;
        session_remove_pending = false;
        _running = false;
@@ -52,24 +67,33 @@ AudioEngine::AudioEngine (string client_name)
        last_monitor_check = 0;
        monitor_check_interval = max_frames;
        _processed_frames = 0;
-       _freewheeling = false;
        _usecs_per_cycle = 0;
        _jack = 0;
        _frame_rate = 0;
        _buffer_size = 0;
-       _freewheeling = false;
        _freewheel_thread_registered = false;
+       _freewheeling = false;
+
+       m_meter_thread = 0;
+       g_atomic_int_set (&m_meter_exit, 0);
 
        if (connect_to_jack (client_name)) {
                throw NoBackendAvailable ();
        }
-
 }
 
 AudioEngine::~AudioEngine ()
 {
-       if (_running) {
-               jack_client_close (_jack);
+       {
+               Glib::Mutex::Lock tm (_process_lock);
+               session_removed.signal ();
+               
+               if (_running) {
+                       jack_client_close (_jack);
+                       _jack = 0;
+               }
+               
+               stop_metering_thread ();
        }
 }
 
@@ -80,25 +104,25 @@ _thread_init_callback (void *arg)
           knows about it.
        */
 
-       PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096);
-
-#ifdef VST_SUPPORT
-       if (Config->get_use_vst()) {
-               fst_adopt_thread ();
-       }
-#endif
+       PBD::notify_gui_about_thread_creation (pthread_self(), X_("Audioengine"), 4096);
 }
 
 int
 AudioEngine::start ()
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+
        if (!_running) {
 
+               nframes_t blocksize = jack_get_buffer_size (_priv_jack);
+               Port::set_buffer_size (blocksize);
+
                if (session) {
-                       jack_nframes_t blocksize = jack_get_buffer_size (_jack);
+
+                       BootMessage (_("Connect session to engine"));
 
                        session->set_block_size (blocksize);
-                       session->set_frame_rate (jack_get_sample_rate (_jack));
+                       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.
@@ -117,59 +141,88 @@ AudioEngine::start ()
                _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);
+               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_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);
+               jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
+               jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
 
                if (Config->get_jack_time_master()) {
-                       jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
+                       jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
                }
 
-               if (jack_activate (_jack) == 0) {
+               if (jack_activate (_priv_jack) == 0) {
                        _running = true;
                        _has_run = true;
                        Running(); /* EMIT SIGNAL */
                } else {
-                       error << _("cannot activate JACK client") << endmsg;
+                       // error << _("cannot activate JACK client") << endmsg;
                }
+
+               start_metering_thread();
        }
 
        return _running ? 0 : -1;
 }
 
 int
-AudioEngine::stop ()
+AudioEngine::stop (bool forever)
 {
-       if (_running) {
-               _running = false;
-               jack_deactivate (_jack);
-               Stopped(); /* EMIT SIGNAL */
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+
+       if (_priv_jack) {
+               if (forever) {
+                       disconnect_from_jack ();
+               } else {
+                       jack_deactivate (_priv_jack);
+                       Stopped(); /* EMIT SIGNAL */
+               }
        }
 
        return _running ? -1 : 0;
 }
 
 
-void
-AudioEngine::_jack_timebase_callback (jack_transport_state_t state, jack_nframes_t nframes,
+bool
+AudioEngine::get_sync_offset (nframes_t& offset) const
+{
+
+#ifdef HAVE_JACK_VIDEO_SUPPORT
 
-                                                                         jack_position_t* pos, int new_position, void *arg)
+        GET_PRIVATE_JACK_POINTER_RET (_jack, false);
+
+       jack_position_t pos;
+       
+       if (_priv_jack) {
+               (void) jack_transport_query (_priv_jack, &pos);
+               
+               if (pos.valid & JackVideoFrameOffset) {
+                       offset = pos.video_offset;
+                       return true;
+               }
+       }
+
+#endif
+
+       return false;
+}
+
+void
+AudioEngine::_jack_timebase_callback (jack_transport_state_t state, nframes_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, jack_nframes_t nframes,
-
-                                                                        jack_position_t* pos, int new_position)
+AudioEngine::jack_timebase_callback (jack_transport_state_t state, nframes_t nframes,
+                                    jack_position_t* pos, int new_position)
 {
-       if (session && session->synced_to_jack()) {
+       if (_jack && session && session->synced_to_jack()) {
                session->jack_timebase_callback (state, nframes, pos, new_position);
        }
 }
@@ -183,29 +236,35 @@ 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 (session) {
+       if (_jack && session) {
                return session->jack_sync_callback (state, pos);
-       } else {
-               return true;
        }
+
+       return true;
 }
 
 int
 AudioEngine::_xrun_callback (void *arg)
 {
-        static_cast<AudioEngine *>(arg)->Xrun (); /* EMIT SIGNAL */
+       AudioEngine* ae = static_cast<AudioEngine*> (arg);
+       if (ae->connected()) {
+               ae->Xrun (); /* EMIT SIGNAL */
+       }
        return 0;
 }
 
 int
 AudioEngine::_graph_order_callback (void *arg)
 {
-        static_cast<AudioEngine *>(arg)->GraphReordered (); /* EMIT SIGNAL */
+       AudioEngine* ae = static_cast<AudioEngine*> (arg);
+       if (ae->connected()) {
+               ae->GraphReordered (); /* EMIT SIGNAL */
+       }
        return 0;
 }
 
 int
-AudioEngine::_process_callback (jack_nframes_t nframes, void *arg)
+AudioEngine::_process_callback (nframes_t nframes, void *arg)
 {
        return static_cast<AudioEngine *> (arg)->process_callback (nframes);
 }
@@ -216,65 +275,14 @@ AudioEngine::_freewheel_callback (int onoff, void *arg)
        static_cast<AudioEngine*>(arg)->_freewheeling = onoff;
 }
 
-void 
-AudioEngine::meter (Port *port, jack_nframes_t nframes)
-{
-       double peak;
-       uint32_t overlen;
-       jack_default_audio_sample_t *buf;
-       
-       buf = port->get_buffer (nframes);
-       peak = port->_peak;
-       overlen = port->overlen;
-       
-       {
-               for (jack_nframes_t n = 0; n < nframes; ++n) {
-                       
-                       /* 1) peak metering */
-                       
-                       peak = f_max (peak, buf[n]);
-                       
-                       /* 2) clip/over metering */
-                       
-                       if (buf[n] >= 1.0) {
-                               overlen++;
-                       } else if (overlen) {
-                               if (overlen > Port::short_over_length) {
-                                       port->_short_overs++;
-                               }
-                               if (overlen > Port::long_over_length) {
-                                       port->_long_overs++;
-                               }
-                               overlen = 0;
-                       }
-               }
-       }
-       
-        /* post-loop check on the final status of overlen */
-       
-       if (overlen > Port::short_over_length) {
-               port->_short_overs++;
-       }
-       if (overlen > Port::long_over_length) {
-               port->_short_overs++;
-       }
-
-       if (peak > 0.0) {
-               port->_peak_db= 20 * fast_log10 (peak);
-       } else {
-               port->_peak_db = minus_infinity();
-       }
-       
-       port->_peak = peak;
-       port->overlen = overlen;
-}
-
 int
-AudioEngine::process_callback (jack_nframes_t nframes)
+AudioEngine::process_callback (nframes_t nframes)
 {
-       TentativeLockMonitor tm (_process_lock, __LINE__, __FILE__);
-       jack_nframes_t next_processed_frames;
-
+       // CycleTimer ct ("AudioEngine::process");
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+       Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);
+       nframes_t next_processed_frames;
+       
        /* handle wrap around of total frames counter */
 
        if (max_frames - _processed_frames < nframes) {
@@ -291,27 +299,26 @@ AudioEngine::process_callback (jack_nframes_t nframes)
        if (session_remove_pending) {
                session = 0;
                session_remove_pending = false;
-               pthread_cond_signal (&session_removed);
+               session_removed.signal();
                _processed_frames = next_processed_frames;
                return 0;
        }
 
+       /* reset port buffer offset for the start of a new cycle */
+
+       Port::set_port_offset (0);
+
+       /* tell all IO objects that we're starting a new cycle */
+
+       IO::CycleStart (nframes);
+
        if (_freewheeling) {
                if (Freewheel (nframes)) {
-                       _freewheeling = false;
-                       jack_set_freewheel (_jack, false);
+                       jack_set_freewheel (_priv_jack, false);
                }
                return 0;
        }
 
-       /* do input peak metering */
-
-       for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
-               if ((*i)->metering) {
-                       meter ((*i), nframes);
-               }
-       }
-       
        session->process (nframes);
 
        if (!_running) {
@@ -322,15 +329,18 @@ AudioEngine::process_callback (jack_nframes_t nframes)
                _processed_frames = next_processed_frames;
                return 0;
        }
-               
+
        if (last_monitor_check + monitor_check_interval < next_processed_frames) {
-               for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
+
+               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;
+                       if (port->_last_monitor != (x = port->monitoring_input ())) {
+                               port->_last_monitor = x;
                                /* XXX I think this is dangerous, due to 
                                   a likely mutex in the signal handlers ...
                                */
@@ -340,18 +350,35 @@ AudioEngine::process_callback (jack_nframes_t nframes)
                last_monitor_check = next_processed_frames;
        }
 
+       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()) {
+                               Sample *buf = port->get_buffer (nframes);
+                               memset (buf, 0, sizeof(Sample) * nframes);
+                               // this should work but doesn't
+                               //port->silence(0, nframes);  //need to implement declicking fade
+                       }
+               }
+       }
+
        _processed_frames = next_processed_frames;
        return 0;
 }
 
 int
-AudioEngine::_sample_rate_callback (jack_nframes_t nframes, void *arg)
+AudioEngine::_sample_rate_callback (nframes_t nframes, void *arg)
 {
        return static_cast<AudioEngine *> (arg)->jack_sample_rate_callback (nframes);
 }
 
 int
-AudioEngine::jack_sample_rate_callback (jack_nframes_t nframes)
+AudioEngine::jack_sample_rate_callback (nframes_t nframes)
 {
        _frame_rate = nframes;
        _usecs_per_cycle = (int) floor ((((double) frames_per_cycle() / nframes)) * 1000000.0);
@@ -360,7 +387,7 @@ AudioEngine::jack_sample_rate_callback (jack_nframes_t nframes)
 
        monitor_check_interval = nframes / 10;
        last_monitor_check = 0;
-
+       
        if (session) {
                session->set_frame_rate (nframes);
        }
@@ -371,19 +398,24 @@ AudioEngine::jack_sample_rate_callback (jack_nframes_t nframes)
 }
 
 int
-AudioEngine::_bufsize_callback (jack_nframes_t nframes, void *arg)
+AudioEngine::_bufsize_callback (nframes_t nframes, void *arg)
 {
        return static_cast<AudioEngine *> (arg)->jack_bufsize_callback (nframes);
 }
 
 int
-AudioEngine::jack_bufsize_callback (jack_nframes_t nframes)
+AudioEngine::jack_bufsize_callback (nframes_t nframes)
 {
        _buffer_size = nframes;
        _usecs_per_cycle = (int) floor ((((double) nframes / frame_rate())) * 1000000.0);
        last_monitor_check = 0;
 
-       for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
+       cerr << "bufsize: Set Port buffer size to " << nframes << endl;
+       Port::set_buffer_size (nframes);
+
+       boost::shared_ptr<Ports> p = ports.reader();
+       
+       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
                (*i)->reset();
        }
 
@@ -394,73 +426,147 @@ AudioEngine::jack_bufsize_callback (jack_nframes_t nframes)
        return 0;
 }
 
+void
+AudioEngine::stop_metering_thread ()
+{
+       if (m_meter_thread) {
+               g_atomic_int_set (&m_meter_exit, 1);
+               m_meter_thread->join ();
+               m_meter_thread = 0;
+       }
+}
+
+void
+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),
+                                                      500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
+       }
+}
+
+void
+AudioEngine::meter_thread ()
+{
+       while (true) {
+               Glib::usleep (10000); /* 1/100th sec interval */
+               if (g_atomic_int_get(&m_meter_exit)) {
+                       break;
+               }
+               IO::update_meters ();
+       }
+}
+
 void 
 AudioEngine::set_session (Session *s)
 {
+       Glib::Mutex::Lock pl (_process_lock);
+
        if (!session) {
+
                session = s;
+
+               nframes_t blocksize = jack_get_buffer_size (_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);
        }
 }
 
 void 
 AudioEngine::remove_session ()
 {
-       LockMonitor lm (_process_lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (_process_lock);
 
        if (_running) {
 
                if (session) {
                        session_remove_pending = true;
-                       pthread_cond_wait (&session_removed, _process_lock.mutex());
-               } 
+                       session_removed.wait(_process_lock);
+               }
 
        } else {
-
                session = 0;
-
        }
        
        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 (_priv_jack, full_portname.c_str());
+       string reason;
+       
+       if (p) {
+               reason = string_compose (_("a port with the name \"%1\" already exists: check for duplicated track/bus names"), portname);
+       } else {
+               reason = _("No more JACK ports are available. You will need to stop Ardour and restart JACK with ports if you need this many tracks.");
+       }
+       
+       throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
+}      
+
 Port *
-AudioEngine::register_audio_input_port (const string& portname)
+AudioEngine::register_input_port (DataType type, const string& portname)
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack,   0);
        if (!_running) {
                if (!_has_run) {
-                       fatal << _("register audio input port called before engine was started") << endmsg;
+                       fatal << _("register input port called before engine was started") << endmsg;
                        /*NOTREACHED*/
                } else {
                        return 0;
                }
        }
 
-       jack_port_t *p = jack_port_register (_jack, portname.c_str(), JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
+       jack_port_t *p = jack_port_register (_priv_jack, portname.c_str(), type.to_jack_type(), JackPortIsInput, 0);
 
        if (p) {
 
                Port *newport;
+
                if ((newport = new Port (p)) != 0) {
-                       ports.insert (ports.begin(), newport);
+                       RCUWriter<Ports> writer (ports);
+                       boost::shared_ptr<Ports> ps = writer.get_copy ();
+                       ps->insert (ps->begin(), newport);
+                       /* writer goes out of scope, forces update */
                }
+
                return newport;
 
        } else {
-
-               pthread_mutex_unlock (_process_lock.mutex());
-               throw PortRegistrationFailure();
+               port_registration_failure (portname);
        }
 
        return 0;
 }
 
 Port *
-AudioEngine::register_audio_output_port (const string& portname)
+AudioEngine::register_output_port (DataType type, const string& portname)
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
+
        if (!_running) {
                if (!_has_run) {
-                       fatal << _("register audio output port called before engine was started") << endmsg;
+                       fatal << _("register output port called before engine was started") << endmsg;
                        /*NOTREACHED*/
                } else {
                        return 0;
@@ -469,23 +575,36 @@ AudioEngine::register_audio_output_port (const string& portname)
 
        jack_port_t *p;
 
-       if ((p = jack_port_register (_jack, portname.c_str(), JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)) != 0) {
-               Port *newport = new Port (p);
-               ports.insert (ports.begin(), newport);
+       if ((p = jack_port_register (_priv_jack, portname.c_str(),
+               type.to_jack_type(), JackPortIsOutput, 0)) != 0) {
+
+               Port *newport = 0;
+
+               {
+                       RCUWriter<Ports> writer (ports);
+                       boost::shared_ptr<Ports> ps = writer.get_copy ();
+                       
+                       newport = new Port (p);
+                       ps->insert (ps->begin(), newport);
+
+                       /* writer goes out of scope, forces update */
+               }
+
                return newport;
 
        } else {
-
-               pthread_mutex_unlock (_process_lock.mutex());
-               throw PortRegistrationFailure ();
+               port_registration_failure (portname);
        }
 
        return 0;
 }
 
+
 int          
 AudioEngine::unregister_port (Port *port)
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
+
        if (!_running) { 
                /* probably happening when the engine has been halted by JACK,
                   in which case, there is nothing we can do here.
@@ -495,15 +614,23 @@ AudioEngine::unregister_port (Port *port)
 
        if (port) {
 
-               int ret = jack_port_unregister (_jack, port->port);
+               int ret = jack_port_unregister (_priv_jack, port->_port);
                
                if (ret == 0) {
-
-                       for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
-                               if ((*i) == port) {
-                                       ports.erase (i);
-                                       break;
+                       
+                       {
+
+                               RCUWriter<Ports> writer (ports);
+                               boost::shared_ptr<Ports> ps = writer.get_copy ();
+                               
+                               for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
+                                       if ((*i) == port) {
+                                               ps->erase (i);
+                                               break;
+                                       }
                                }
+
+                               /* writer goes out of scope, forces update */
                        }
 
                        remove_connections_for (port);
@@ -519,23 +646,20 @@ AudioEngine::unregister_port (Port *port)
 int 
 AudioEngine::connect (const string& source, const string& destination)
 {
-       if (!_running) {
-               if (!_has_run) {
-                       fatal << _("connect called before engine was started") << endmsg;
-                       /*NOTREACHED*/
-               } else {
-                       return -1;
-               }
-       }
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
        
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
 
-       int ret = jack_connect (_jack, s.c_str(), d.c_str());
+       int ret = jack_connect (_priv_jack, s.c_str(), d.c_str());
 
        if (ret == 0) {
                pair<string,string> c (s, d);
                port_connections.push_back (c);
+       } else if (ret == EEXIST) {
+               error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"), 
+                                source, s, destination, d) 
+                     << endmsg;
        } else {
                error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), 
                                 source, s, destination, d) 
@@ -548,6 +672,8 @@ AudioEngine::connect (const string& source, const string& destination)
 int 
 AudioEngine::disconnect (const string& source, const string& destination)
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
+     
        if (!_running) {
                if (!_has_run) {
                        fatal << _("disconnect called before engine was started") << endmsg;
@@ -560,7 +686,7 @@ AudioEngine::disconnect (const string& source, const string& destination)
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
 
-       int ret = jack_disconnect (_jack, s.c_str(), d.c_str());
+       int ret = jack_disconnect (_priv_jack, s.c_str(), d.c_str());
 
        if (ret == 0) {
                pair<string,string> c (s, d);
@@ -577,6 +703,8 @@ AudioEngine::disconnect (const string& source, const string& destination)
 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;
@@ -586,7 +714,7 @@ AudioEngine::disconnect (Port *port)
                }
        }
 
-       int ret = jack_port_disconnect (_jack, port->port);
+       int ret = jack_port_disconnect (_priv_jack, port->_port);
 
        if (ret == 0) {
                remove_connections_for (port);
@@ -596,44 +724,33 @@ AudioEngine::disconnect (Port *port)
 
 }
 
-jack_nframes_t
+nframes_t
 AudioEngine::frame_rate ()
 {
-       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;
        }
 }
 
-jack_nframes_t
+nframes_t
 AudioEngine::frames_per_cycle ()
 {
-       if (_jack) {
-               if (_buffer_size == 0) {
-                       return (_buffer_size = jack_get_buffer_size (_jack));
-               } else {
-                       return _buffer_size;
-               }
+        GET_PRIVATE_JACK_POINTER_RET (_jack,0);
+       if (_buffer_size == 0) {
+         return (_buffer_size = 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;
        }
 }
 
 Port *
 AudioEngine::get_port_by_name (const string& portname, bool keep)
 {
-       LockMonitor lm (_process_lock, __LINE__, __FILE__);
+       Glib::Mutex::Lock lm (_process_lock);
+        GET_PRIVATE_JACK_POINTER_RET (_jack,0);
 
        if (!_running) {
                if (!_has_run) {
@@ -646,7 +763,9 @@ AudioEngine::get_port_by_name (const string& portname, bool keep)
        
        /* check to see if we have a Port for this name already */
 
-       for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
+       boost::shared_ptr<Ports> pr = ports.reader();
+       
+       for (Ports::iterator i = pr->begin(); i != pr->end(); ++i) {
                if (portname == (*i)->name()) {
                        return (*i);
                }
@@ -654,13 +773,22 @@ AudioEngine::get_port_by_name (const string& portname, bool keep)
 
        jack_port_t *p;
 
-       if ((p = jack_port_by_name (_jack, portname.c_str())) != 0) {
+       if ((p = jack_port_by_name (_priv_jack, portname.c_str())) != 0) {
                Port *newport = new Port (p);
-               if (keep && newport->is_mine (_jack)) {
-                       ports.insert (newport);
+
+               {
+                       if (keep && newport->is_mine (_jack)) {
+                               RCUWriter<Ports> writer (ports);
+                               boost::shared_ptr<Ports> ps = writer.get_copy ();
+                               ps->insert (newport);
+                               /* writer goes out of scope, forces update */
+                       }
                }
+
                return newport;
+
        } else {
+
                return 0;
        }
 }
@@ -668,6 +796,7 @@ AudioEngine::get_port_by_name (const string& portname, bool keep)
 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;
@@ -676,86 +805,138 @@ 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 (void *arg)
 {
-       AudioEngine *ae = reinterpret_cast<AudioEngine *> (arg);
+        /* called from jack shutdown handler  */
 
-       ae->_running = false;
-       ae->_jack = 0;
+       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) {
+               ae->Halted(); /* 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 () 
+{
+        GET_PRIVATE_JACK_POINTER_RET (_jack,false);
+       const char ** ports;
+
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
+               return false;
+       }
 
-       ae->Halted(); /* EMIT SIGNAL */
+       free (ports);
+
+       return true;
 }
 
+
 uint32_t
-AudioEngine::n_physical_outputs () const
+AudioEngine::n_physical_audio_outputs () const
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack,0);
        const char ** ports;
        uint32_t i = 0;
 
-       if (!_jack) {
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsInput)) == 0) {
                return 0;
        }
 
-       if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) {
-               return 0;
-       }
+       for (i = 0; ports[i]; ++i);
+       free (ports);
 
-       if (ports) {
-               for (i = 0; ports[i]; ++i);
-               free (ports);
-       }
        return i;
 }
 
 uint32_t
-AudioEngine::n_physical_inputs () const
+AudioEngine::n_physical_audio_inputs () const
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack,0);
        const char ** ports;
        uint32_t i = 0;
        
-       if (!_jack) {
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput)) == 0) {
                return 0;
        }
+
+       for (i = 0; ports[i]; ++i);
+       free (ports);
+
+       return i;
+}
+
+void
+AudioEngine::get_physical_audio_inputs (vector<string>& ins)
+{
+        GET_PRIVATE_JACK_POINTER (_jack);
+       const char ** ports;
+       uint32_t i = 0;
        
-       if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) {
-               return 0;
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput)) == 0) {
+               return;
        }
 
-       if (ports) {
-               for (i = 0; ports[i]; ++i);
-               free (ports);
+       for (i = 0; ports[i]; ++i) {
+               ins.push_back (ports[i]);
        }
-       return i;
+
+       free (ports);
 }
 
-string
+void
+AudioEngine::get_physical_audio_outputs (vector<string>& outs)
+{
+        GET_PRIVATE_JACK_POINTER (_jack);
+       const char ** ports;
+       uint32_t i = 0;
+       
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsInput)) == 0) {
+               return;
+       }
+
+       for (i = 0; ports[i]; ++i) {
+               outs.push_back (ports[i]);
+       }
+
+       free (ports);
+}
 
-AudioEngine::get_nth_physical (uint32_t n, int flag)
+string
+AudioEngine::get_nth_physical_audio (uint32_t n, int flag)
 {
+        GET_PRIVATE_JACK_POINTER_RET (_jack,"");
        const char ** ports;
        uint32_t i;
        string ret;
 
-       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, NULL, JackPortIsPhysical|flag);
-       
-       if (ports == 0) {
-               return "";
+       if ((ports = jack_get_ports (_priv_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|flag)) == 0) {
+               return ret;
        }
 
        for (i = 0; i < n && ports[i]; ++i);
@@ -764,110 +945,101 @@ AudioEngine::get_nth_physical (uint32_t n, int flag)
                ret = ports[i];
        }
 
-       free ((char *) ports);
+       free (ports);
 
        return ret;
 }
 
-jack_nframes_t
+nframes_t
 AudioEngine::get_port_total_latency (const Port& port)
 {
-       if (!_jack) {
-               fatal << _("get_port_total_latency() called with no JACK client connection") << endmsg;
-               /*NOTREACHED*/
-       }
+        GET_PRIVATE_JACK_POINTER_RET (_jack,0);
 
-       if (!_running) {
-               if (!_has_run) {
-                       fatal << _("get_port_total_latency() called before engine was started") << endmsg;
-                       /*NOTREACHED*/
-               } 
-       }
-
-       return jack_port_get_total_latency (_jack, port.port);
+       return jack_port_get_total_latency (_priv_jack, port._port);
 }
 
 void
 AudioEngine::transport_stop ()
 {
-       // cerr << "tell JACK to stop\n";
-       if (_jack) {
-               jack_transport_stop (_jack);
-       }
+        GET_PRIVATE_JACK_POINTER (_jack);
+       jack_transport_stop (_priv_jack);
 }
 
 void
 AudioEngine::transport_start ()
 {
-       // cerr << "tell JACK to start\n";
-       if (_jack) {
-               jack_transport_start (_jack);
-       }
+        GET_PRIVATE_JACK_POINTER (_jack);
+       jack_transport_start (_priv_jack);
 }
 
 void
-AudioEngine::transport_locate (jack_nframes_t where)
+AudioEngine::transport_locate (nframes_t where)
 {
+        GET_PRIVATE_JACK_POINTER (_jack);
        // cerr << "tell JACK to locate to " << where << endl;
-       if (_jack) {
-               jack_transport_locate (_jack, where);
-       }
+       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);
-               } else {
-                       return jack_release_timebase (_jack);
-               }
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+       if (Config->get_jack_time_master()) {
+         return jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
        } else {
-               return -1;
+         return jack_release_timebase (_jack);
        }
 }
 
 int
 AudioEngine::freewheel (bool onoff)
 {
-       if (_jack) {
-
-               if (onoff) {
-                       _freewheel_thread_registered = false;
-               }
-
-               return jack_set_freewheel (_jack, onoff);
-
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -1);
+
+       if (onoff != _freewheeling) {
+         
+         if (onoff) {
+           _freewheel_thread_registered = false;
+         }
+         
+         return jack_set_freewheel (_priv_jack, onoff);
+         
        } else {
-               return -1;
+         /* already doing what has been asked for */
+         return 0;
        }
 }
 
 void
 AudioEngine::remove_all_ports ()
 {
+       jack_client_t* _priv_jack = _jack;
+
        /* process lock MUST be held */
 
-       if (_jack) {
-               for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
-                       jack_port_unregister (_jack, (*i)->port);
-               }
-       }
+       if (_priv_jack) {
 
-       ports.clear ();
-       port_connections.clear ();
+        boost::shared_ptr<Ports> p = ports.reader();
+        
+        for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+          jack_port_unregister (_priv_jack, (*i)->_port);
+        }
+       }
+       {
+        RCUWriter<Ports> writer (ports);
+        boost::shared_ptr<Ports> ps = writer.get_copy ();
+        ps->clear ();
+       }
+       
+       port_connections.clear ();
 }
 
 void
@@ -897,26 +1069,20 @@ AudioEngine::connect_to_jack (string client_name)
        const char *server_name = NULL;
 
        jack_client_name = client_name; /* might be reset below */
-
        _jack = jack_client_open (jack_client_name.c_str(), options, &status, server_name);
-       
-       if (_jack == NULL) {
 
-               if (status & JackServerFailed) {
-                       error << _("Unable to connect to JACK server") << endmsg;
-               }
-               
-               error << string_compose (_("Could not connect to JACK server as  \"%1\""), jack_client_name) <<  endmsg;
+       if (_jack == NULL) {
+               /* just return without an error message. something else will take care of it */
                return -1;
        }
 
-       if (status & JackServerStarted) {
-               info << _("JACK server started") << endmsg;
-       }
+        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;
 }
@@ -928,7 +1094,7 @@ AudioEngine::connect_to_jack (string client_name)
 {
        jack_client_name = client_name;
 
-       if ((_jack = jack_client_new (client_name.c_str())) == NULL) {
+       if ((_jack = jack_client_new (client_name.c_str())) == 0) {
                return -1;
        }
 
@@ -940,12 +1106,16 @@ AudioEngine::connect_to_jack (string client_name)
 int 
 AudioEngine::disconnect_from_jack ()
 {
-       if (_jack == 0) {
-               return 0;
+        GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
+
+       if (_running) {
+               stop_metering_thread ();
        }
 
-       if (jack_client_close (_jack)) {
-               error << _("cannot shutdown connection to JACK") << endmsg;
+       { 
+               Glib::Mutex::Lock lm (_process_lock);
+               jack_client_close (_priv_jack);
+               _jack = 0;
        }
 
        _buffer_size = 0;
@@ -956,17 +1126,16 @@ AudioEngine::disconnect_from_jack ()
                Stopped(); /* EMIT SIGNAL */
        }
 
-       _jack = 0;
        return 0;
 }
 
 int
 AudioEngine::reconnect_to_jack ()
 {
-       if (_jack) {
+       if (_running) {
                disconnect_from_jack ();
                /* XXX give jackd a chance */
-               usleep (250000);
+               Glib::usleep (250000);
        }
 
        if (connect_to_jack (jack_client_name)) {
@@ -974,9 +1143,16 @@ AudioEngine::reconnect_to_jack ()
                return -1;
        }
 
+       /* Now that we're connected again, we can get a private
+          pointer to the jack client.
+       */
+
+        GET_PRIVATE_JACK_POINTER_RET (_jack,-1);
+
        Ports::iterator i;
+       boost::shared_ptr<Ports> p = ports.reader ();
 
-       for (i = ports.begin(); i != ports.end(); ++i) {
+       for (i = p->begin(); i != p->end(); ++i) {
 
                /* XXX hack hack hack */
 
@@ -985,7 +1161,7 @@ AudioEngine::reconnect_to_jack ()
                
                short_name = long_name.substr (long_name.find_last_of (':') + 1);
 
-               if (((*i)->port = jack_port_register (_jack, short_name.c_str(), (*i)->type(), (*i)->flags(), 0)) == 0) {
+               if (((*i)->_port = jack_port_register (_priv_jack, short_name.c_str(), (*i)->type(), (*i)->flags(), 0)) == 0) {
                        error << string_compose (_("could not reregister %1"), (*i)->name()) << endmsg;
                        break;
                } else {
@@ -994,41 +1170,44 @@ AudioEngine::reconnect_to_jack ()
                (*i)->reset ();
 
                if ((*i)->flags() & JackPortIsOutput) {
-                       (*i)->silence (jack_get_buffer_size (_jack), 0);
+                       (*i)->silence (jack_get_buffer_size (_priv_jack));
                }
        }
 
-       if (i != ports.end()) {
-               for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) {
-                       jack_port_unregister (_jack, (*i)->port);
+       if (i != p->end()) {
+               /* failed */
+               for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+                       jack_port_unregister (_priv_jack, (*i)->_port);
                }
                return -1;
        } 
 
 
        if (session) {
-               jack_nframes_t blocksize = jack_get_buffer_size (_jack);
+               session->reset_jack_connection (_priv_jack);
+               nframes_t blocksize = jack_get_buffer_size (_priv_jack);
+               Port::set_buffer_size (blocksize);
                session->set_block_size (blocksize);
-               session->set_frame_rate (jack_get_sample_rate (_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);
+       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_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);
+       jack_set_sync_callback (_priv_jack, _jack_sync_callback, this);
+       jack_set_freewheel_callback (_priv_jack, _freewheel_callback, this);
        
        if (Config->get_jack_time_master()) {
-               jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this);
-       }
+               jack_set_timebase_callback (_priv_jack, 0, _jack_timebase_callback, this);
+       } 
        
-       if (jack_activate (_jack) == 0) {
+       if (jack_activate (_priv_jack) == 0) {
                _running = true;
                _has_run = true;
        } else {
@@ -1040,8 +1219,13 @@ AudioEngine::reconnect_to_jack ()
        for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
                
                int err;
+
+               if (!_jack) {
+                       error << _("Disconnected from JACK while reconnecting. You should quit Ardour now.") << endmsg;
+                       return -1;
+               }
                
-               if ((err = jack_connect (_jack, (*i).first.c_str(), (*i).second.c_str())) != 0) {
+               if ((err = jack_connect (_priv_jack, (*i).first.c_str(), (*i).second.c_str())) != 0) {
                        if (err != EEXIST) {
                                error << string_compose (_("could not reconnect %1 and %2 (err = %3)"),
                                                  (*i).first, (*i).second, err)
@@ -1052,25 +1236,29 @@ AudioEngine::reconnect_to_jack ()
 
        Running (); /* EMIT SIGNAL*/
 
+       start_metering_thread ();
+
        return 0;
 }
 
 int
-AudioEngine::request_buffer_size (jack_nframes_t nframes)
+AudioEngine::request_buffer_size (nframes_t nframes)
 {
-       if (_jack) {
-               int ret = jack_set_buffer_size (_jack, nframes);
-               return ret;
-       } else {
-               return -1;
+        GET_PRIVATE_JACK_POINTER_RET (_jack, -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
-       jack_recompute_total_latencies (_jack);
+        GET_PRIVATE_JACK_POINTER (_jack);
+       jack_recompute_total_latencies (_priv_jack);
 #endif
 }
                
@@ -1111,3 +1299,9 @@ AudioEngine::make_port_name_non_relative (string portname)
        return str;
 }
 
+bool
+AudioEngine::is_realtime () const
+{
+        GET_PRIVATE_JACK_POINTER_RET (_jack,false);
+       return jack_is_realtime (_priv_jack);
+}