fix SConstruct so that it can build from a git checkout rather than an svn checkout
[ardour.git] / libs / ardour / audioengine.cc
index 2e1b790848d90fbe8fbcc250bdc8402af5f65f97..3122ff760c71eb22d8378dd213310b039cebe881 100644 (file)
 #include <vector>
 #include <exception>
 #include <stdexcept>
+#include <sstream>
 
 #include <glibmm/timer.h>
 #include <pbd/pthread_utils.h>
 #include <pbd/stacktrace.h>
 #include <pbd/unknown_type.h>
 
+#include <midi++/jack.h>
+
 #include <ardour/audioengine.h>
 #include <ardour/buffer.h>
 #include <ardour/port.h>
 #include <ardour/jack_audio_port.h>
-#include <ardour/internal_audio_port.h>
 #include <ardour/jack_midi_port.h>
+#include <ardour/audio_port.h>
 #include <ardour/session.h>
 #include <ardour/cycle_timer.h>
 #include <ardour/utils.h>
@@ -67,13 +70,12 @@ 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);
@@ -82,9 +84,24 @@ AudioEngine::AudioEngine (string client_name)
                throw NoBackendAvailable ();
        }
 
-       start_metering_thread();
-
-       JackPort::set_engine (this);
+       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 ()
@@ -95,6 +112,7 @@ AudioEngine::~AudioEngine ()
                
                if (_running) {
                        jack_client_close (_jack);
+                       _jack = 0;
                }
                
                stop_metering_thread ();
@@ -115,16 +133,24 @@ _thread_init_callback (void *arg)
        */
 
        PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096);
+       MIDI::JACK_MidiPort::set_process_thread (pthread_self());
 }
 
 int
 AudioEngine::start ()
 {
+       if (!_jack) {
+               error << _("AudioEngine::start() called while disconnected from JACK") << endmsg;
+               return -1;
+       }
+
        if (!_running) {
 
                if (session) {
                        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));
 
@@ -166,6 +192,8 @@ AudioEngine::start ()
                } else {
                        // error << _("cannot activate JACK client") << endmsg;
                }
+
+               start_metering_thread();
        }
 
        return _running ? 0 : -1;
@@ -174,17 +202,13 @@ AudioEngine::start ()
 int
 AudioEngine::stop (bool forever)
 {
-       if (_running) {
-               _running = false;
+       if (_jack) {
                if (forever) {
-                       jack_client_t* foo = _jack;
-                       _jack = 0;
-                       jack_client_close (foo);
-                       stop_metering_thread ();
+                       disconnect_from_jack ();
                } else {
                        jack_deactivate (_jack);
+                       Stopped(); /* EMIT SIGNAL */
                }
-               Stopped(); /* EMIT SIGNAL */
        }
 
        return _running ? -1 : 0;
@@ -199,11 +223,13 @@ AudioEngine::get_sync_offset (nframes_t& offset) const
 
        jack_position_t pos;
        
-       (void) jack_transport_query (_jack, &pos);
-
-       if (pos.valid & JackVideoFrameOffset) {
-               offset = pos.video_offset;
-               return true;
+       if (_jack) {
+               (void) jack_transport_query (_jack, &pos);
+               
+               if (pos.valid & JackVideoFrameOffset) {
+                       offset = pos.video_offset;
+                       return true;
+               }
        }
 
 #endif
@@ -247,7 +273,7 @@ int
 AudioEngine::_xrun_callback (void *arg)
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
-       if (ae->jack()) {
+       if (ae->connected()) {
                ae->Xrun (); /* EMIT SIGNAL */
        }
        return 0;
@@ -257,7 +283,7 @@ int
 AudioEngine::_graph_order_callback (void *arg)
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
-       if (ae->jack()) {
+       if (ae->connected()) {
                ae->GraphReordered (); /* EMIT SIGNAL */
        }
        return 0;
@@ -316,36 +342,46 @@ AudioEngine::process_callback (nframes_t nframes)
                return 0;
        }
 
+       boost::shared_ptr<Ports> p = ports.reader();
+
+       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+
+               /* Only run cycle_start() on output ports, because 
+                  inputs must be done in the correct processing order,
+                  which requires interleaving with route processing.
+               */
+
+               if ((*i)->sends_output()) {
+                       (*i)->cycle_start (nframes, 0);
+               }
+       }
+
        if (_freewheeling) {
                /* emit the Freewheel signal and stop freewheeling in the event of trouble */
                if (Freewheel (nframes)) {
-                       cerr << "Freewheeling returned non-zero!\n";
-                       _freewheeling = false;
                        jack_set_freewheel (_jack, false);
                }
-               return 0;
-       }
 
-       boost::shared_ptr<Ports> p = ports.reader();
+       } else {
+               if (session) {
+                       session->process (nframes);
+               }
+       }
+       
+       // Finalize ports (ie write data if necessary)
 
-       // Prepare ports (ie read data if necessary)
        for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               (*i)->cycle_start (nframes);
+               (*i)->cycle_end (nframes, 0);
        }
-       
-       if (session) {
-               session->process (nframes);
+
+       if (_freewheeling) {
+               return 0;
        }
 
        if (!_running) {
                _processed_frames = next_processed_frames;
                return 0;
        }
-       
-       // Finalize ports (ie write data if necessary)
-       for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               (*i)->cycle_end ();
-       }
 
        if (last_monitor_check + monitor_check_interval < next_processed_frames) {
 
@@ -367,6 +403,20 @@ AudioEngine::process_callback (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()) {
+                               port->get_buffer().silence(nframes);
+                       }
+               }
+       }
+
        _processed_frames = next_processed_frames;
        return 0;
 }
@@ -437,8 +487,9 @@ 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);
+                                                      500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
        }
 }
 
@@ -471,8 +522,11 @@ AudioEngine::set_session (Session *s)
                
                boost::shared_ptr<Ports> p = ports.reader();
 
-               for (Ports::iterator i = p->begin(); i != p->end(); ++i)
-                       (*i)->cycle_start (blocksize);
+               for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+                       if ((*i)->sends_output()) {
+                               (*i)->cycle_start (blocksize, 0);
+                       }
+               }
 
                s->process (blocksize);
                s->process (blocksize);
@@ -483,9 +537,9 @@ AudioEngine::set_session (Session *s)
                s->process (blocksize);
                s->process (blocksize);
 
-               for (Ports::iterator i = p->begin(); i != p->end(); ++i)
-                       (*i)->cycle_end ();
-
+               for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+                       (*i)->cycle_end (blocksize, 0);
+               }
        }
 }
 
@@ -505,61 +559,73 @@ AudioEngine::remove_session ()
                session = 0;
        }
        
-       remove_all_ports ();
+       //FIXME: Preliminary bugfix for  http://tracker.ardour.org/view.php?id=1985
+       //remove_all_ports ();
 }
 
+void
+AudioEngine::port_registration_failure (const std::string& portname)
+{
+       string full_portname = jack_client_name;
+       full_portname += ':';
+       full_portname += portname;
+       
+       
+       jack_port_t* p = jack_port_by_name (_jack, full_portname.c_str());
+       string reason;
+       
+       if (p) {
+               reason = _("a port with this name already exists: check for duplicated track/bus names");
+       } else {
+               reason = _("unknown error");
+       }
+       
+       throw PortRegistrationFailure (string_compose (_("AudioEngine: cannot register port \"%1\": %2"), portname, reason).c_str());
+}      
+
 Port *
-AudioEngine::register_port (PortType ptype, DataType dtype, const string& portname, bool input)
+AudioEngine::register_port (DataType dtype, const string& portname, bool input, bool publish)
 {
        Port* newport = 0;
 
+       /*cerr << "trying to register port with name " << portname << endl;*/
        try {
-               switch (ptype) {
-               case Jack:
-                       if (dtype == DataType::AUDIO) {
-                               newport = new JackAudioPort (portname, (input ? Port::IsInput : Port::IsOutput));
-                       } else if (dtype == DataType::MIDI) {
-                               newport = new JackMidiPort (portname, (input ? Port::IsInput : Port::IsOutput));
-                       } else {
-                               throw unknown_type();
-                       }
-                       break;
-
-               case Internal:
-                       if (dtype == DataType::AUDIO) {
-                               newport = new InternalAudioPort (portname, (input ? Port::IsInput : Port::IsOutput));
-                       } else if (dtype == DataType::MIDI) {
-                               error << _("Internal MIDI ports are not implemented yet!") << endmsg;
-                               throw unknown_type();
-                       } else {
-                               throw unknown_type();
-                       }
-                       break;
-               }
-       
-               if (newport != 0) {
-                       RCUWriter<Ports> writer (ports);
-                       boost::shared_ptr<Ports> ps = writer.get_copy ();
-                       ps->insert (ps->begin(), newport);
-                       /* writer goes out of scope, forces update */
+               if (dtype == DataType::AUDIO) {
+                       newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
+               } else if (dtype == DataType::MIDI) {
+                       newport = new MidiPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
+               } else {
+                       throw unknown_type();
                }
-       
+
+               /*cerr << "successfully got port " << portname << " with address " << newport << endl;*/
+
+               RCUWriter<Ports> writer (ports);
+               boost::shared_ptr<Ports> ps = writer.get_copy ();
+               /*cerr << "Address of ports list: " << ps << endl
+                    << "Ports set size before insert: " << ps->size() << endl;*/
+               ps->insert (ps->begin(), newport);
+               /*cerr << "Ports set size after insert: " << ps->size() << endl;*/
+
+               /* writer goes out of scope, forces update */
+
                return newport;
        }
 
        catch (...) {
-               throw PortRegistrationFailure();
+               throw PortRegistrationFailure("unable to create port (unknown type?)");
        }
 }
 
-InternalPort*
-AudioEngine::get_internal_port (const std::string& short_name)
+Port*
+AudioEngine::get_port (const std::string& full_name)
 {
        boost::shared_ptr<Ports> p = ports.reader();
        
        for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-               if ((*i)->short_name() == short_name) {
-                       return dynamic_cast<InternalPort*> (*i);
+               //cerr << "comparing port name '" << (*i)->name() << "' with '" << full_name << "'" << endl;
+               if ((*i)->name() == full_name) {
+                       return *i;
                }
        }
        return 0;
@@ -567,43 +633,56 @@ AudioEngine::get_internal_port (const std::string& short_name)
 
 
 Port *
-AudioEngine::register_input_port (PortType ptype, DataType type, const string& portname)
+AudioEngine::register_input_port (DataType type, const string& portname, bool publish)
 {
-       return register_port (ptype, type, portname, true);
+       return register_port (type, portname, true, publish);
 }
 
 Port *
-AudioEngine::register_output_port (PortType ptype, DataType type, const string& portname)
+AudioEngine::register_output_port (DataType type, const string& portname, bool publish)
 {
-       return register_port (ptype, type, portname, false);
+       return register_port (type, portname, false, publish);
 }
 
-int          
+int
 AudioEngine::unregister_port (Port& port)
 {
+       /* caller must hold process lock */
+
+       cerr << "about to unregister Port xx  x" << &port << "\n";
+
        if (!_running) { 
                /* probably happening when the engine has been halted by JACK,
                   in which case, there is nothing we can do here.
                   */
+               cerr << "not running\n";
                return 0;
        }
 
        {
+               cerr << "before getcopy\n";
                
                RCUWriter<Ports> writer (ports);
                boost::shared_ptr<Ports> ps = writer.get_copy ();
                
+               cerr << "Ports set size: " << ps.get()->size() << endl;
+
                for (Ports::iterator i = ps->begin(); i != ps->end(); ++i) {
+                       cerr << "before delete" << endl;
                        if ((*i) == &port) {
-                               remove_connections_for (port);
+                               cerr << "About to delete " << &port << endl;
                                delete *i;
                                ps->erase (i);
+                               cerr << "After erasing ports size: " << ps->size();
                                break;
                        }
                }
                
                /* writer goes out of scope, forces update */
        }
+               
+       cerr << "before remove_connections\n";
+       remove_connections_for (port);
 
        return 0;
 }
@@ -625,33 +704,55 @@ AudioEngine::connect (const string& source, const string& destination)
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
                
-       if (source.substr (0, 9) == "internal:") {
-               if (destination.substr (0, 9) == "internal:") {
-                       InternalPort* src = get_internal_port (source);
-                       InternalPort* dst = get_internal_port (destination);
+       //cerr << "Trying to connect source: " << s << " with destination " << d << endl;
+       
+       Port* src = get_port (s);
+       Port* dst = get_port (d);
+
+       if (src && dst) {
 
-                       InternalPort::connect (*src, *dst);
-                       ret = 0;
+               /* both ports are known to us, so do the internal connect stuff */
 
+               if ((ret = src->connect (*dst)) == 0) {
+                       ret = dst->connect (*src);
+               }
+
+       } else if (src || dst) {
+
+               /* one port is known to us, try to connect it to something external */
+
+               PortConnectableByName* pcn;
+               string other;
+
+               if (src) {
+                       pcn = dynamic_cast<PortConnectableByName*>(src);
+                       other = d;
+               } else {
+                       pcn = dynamic_cast<PortConnectableByName*>(dst);
+                       other = s;
+               }
+
+               if (pcn) {
+                       ret = pcn->connect (other);
                } else {
                        ret = -1;
                }
 
        } else {
-       
-               ret = jack_connect (_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) {
+               /* neither port is known to us, and this API isn't intended for use as a general patch bay */
+
+               ret = -1;
+               
+       }
+       
+       if (ret > 0) {
                error << string_compose(_("AudioEngine: connection already exists: %1 (%2) to %3 (%4)"), 
-                                source, s, destination, d) 
+                                       source, s, destination, d) 
                      << endmsg;
-       } else {
+       } else if (ret < 0) {
                error << string_compose(_("AudioEngine: cannot connect %1 (%2) to %3 (%4)"), 
-                                source, s, destination, d) 
+                                       source, s, destination, d) 
                      << endmsg;
        }
 
@@ -675,31 +776,49 @@ AudioEngine::disconnect (const string& source, const string& destination)
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
 
-       if (source.substr (0, 9) == "internal:") {
-               if (destination.substr (0, 9) == "internal:") {
-                       InternalPort* src = get_internal_port (source);
-                       InternalPort* dst = get_internal_port (destination);
+       //cerr << "trying to disconnect port '" << s << "' from port '" << d << endl;
+       
+       Port* src = get_port (s);
+       Port* dst = get_port (d);
+
+       if (src && dst) {
+
+               /* both ports are known to us, so do the internal connect stuff */
+               
+               if ((ret = src->disconnect (*dst)) == 0) {
+                       ret = dst->disconnect (*src);
+               }
+
+       } else if (src || dst) {
+
+               /* one port is known to us, try to connect it to something external */
 
-                       InternalPort::disconnect (*src, *dst);
-                       ret = 0;
+
+               PortConnectableByName* pcn;
+               string other;
+
+               if (src) {
+                       pcn = dynamic_cast<PortConnectableByName*>(src);
+                       other = d;
+               } else {
+                       pcn = dynamic_cast<PortConnectableByName*>(dst);
+                       other = s;
+               }
+
+               if (pcn) {
+                       ret = pcn->disconnect (other);
                } else {
                        ret = -1;
                }
 
        } else {
-       
-               ret = jack_disconnect (_jack, s.c_str(), d.c_str());
-       }
 
-       if (ret == 0) {
-               pair<string,string> c (s, d);
-               PortConnections::iterator i;
+               /* neither port is known to us, and this API isn't intended for use as a general patch bay */
+               
+               ret = -1;
                
-               if ((i = find (port_connections.begin(), port_connections.end(), c)) != port_connections.end()) {
-                       port_connections.erase (i);
-               }
        }
-        
+       
        return ret;
 }
 
@@ -715,14 +834,7 @@ AudioEngine::disconnect (Port& port)
                }
        }
 
-       int ret = port.disconnect ();
-
-       if (ret == 0) {
-               remove_connections_for (port);
-       }
-
-       return ret;
-
+       return port.disconnect_all ();
 }
 
 ARDOUR::nframes_t
@@ -763,7 +875,7 @@ AudioEngine::frames_per_cycle ()
  * Note this can return NULL, it will NOT create a port if it is not found (any more).
  */
 Port *
-AudioEngine::get_port_by_name (const string& portname, bool keep) const
+AudioEngine::get_port_by_name (const string& portname, bool keep)
 {
        Glib::Mutex::Lock lm (_process_lock);
 
@@ -805,17 +917,42 @@ void
 AudioEngine::halted (void *arg)
 {
        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;
 
-       ae->Halted(); /* EMIT SIGNAL */
+       cerr << "!!! HALTED !!!\n";
+
+       if (was_running) {
+               ae->Halted(); /* EMIT SIGNAL */
+       }
+}
+
+bool
+AudioEngine::can_request_hardware_monitoring () 
+{
+       const char ** ports;
+
+       if (!_jack) {
+               return 0;
+       }
+
+       if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortCanMonitor)) == 0) {
+               return false;
+       }
+
+       free (ports);
+
+       return true;
 }
 
+
 uint32_t
-AudioEngine::n_physical_outputs () const
+AudioEngine::n_physical_outputs (DataType type) const
 {
        const char ** ports;
        uint32_t i = 0;
@@ -824,19 +961,18 @@ AudioEngine::n_physical_outputs () const
                return 0;
        }
 
-       if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) {
+       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
                return 0;
        }
 
-       if (ports) {
-               for (i = 0; ports[i]; ++i);
-               free (ports);
-       }
+       for (i = 0; ports[i]; ++i);
+       free (ports);
+
        return i;
 }
 
 uint32_t
-AudioEngine::n_physical_inputs () const
+AudioEngine::n_physical_inputs (DataType type) const
 {
        const char ** ports;
        uint32_t i = 0;
@@ -845,7 +981,7 @@ AudioEngine::n_physical_inputs () const
                return 0;
        }
        
-       if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) {
+       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
                return 0;
        }
 
@@ -857,7 +993,7 @@ AudioEngine::n_physical_inputs () const
 }
 
 void
-AudioEngine::get_physical_inputs (vector<string>& ins)
+AudioEngine::get_physical_inputs (DataType type, vector<string>& ins)
 {
        const char ** ports;
        uint32_t i = 0;
@@ -866,7 +1002,7 @@ AudioEngine::get_physical_inputs (vector<string>& ins)
                return;
        }
        
-       if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsOutput)) == 0) {
+       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsOutput)) == 0) {
                return;
        }
 
@@ -879,7 +1015,7 @@ AudioEngine::get_physical_inputs (vector<string>& ins)
 }
 
 void
-AudioEngine::get_physical_outputs (vector<string>& outs)
+AudioEngine::get_physical_outputs (DataType type, vector<string>& outs)
 {
        const char ** ports;
        uint32_t i = 0;
@@ -888,7 +1024,7 @@ AudioEngine::get_physical_outputs (vector<string>& outs)
                return;
        }
        
-       if ((ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|JackPortIsInput)) == 0) {
+       if ((ports = jack_get_ports (_jack, NULL, type.to_jack_type(), JackPortIsPhysical|JackPortIsInput)) == 0) {
                return;
        }
 
@@ -962,7 +1098,6 @@ AudioEngine::update_total_latency (const Port& port)
 void
 AudioEngine::transport_stop ()
 {
-       // cerr << "tell JACK to stop\n";
        if (_jack) {
                jack_transport_stop (_jack);
        }
@@ -1016,11 +1151,18 @@ AudioEngine::freewheel (bool onoff)
 {
        if (_jack) {
 
-               if (onoff) {
-                       _freewheel_thread_registered = false;
-               }
+               if (onoff != _freewheeling) {
+
+                       if (onoff) {
+                               _freewheel_thread_registered = false;
+                       }
 
-               return jack_set_freewheel (_jack, onoff);
+                       return jack_set_freewheel (_jack, onoff);
+
+               } else {
+                       /* already doing what has been asked for */
+                       return 0;
+               }
 
        } else {
                return -1;
@@ -1037,8 +1179,6 @@ AudioEngine::remove_all_ports ()
                boost::shared_ptr<Ports> ps = writer.get_copy ();
                ps->clear ();
        }
-
-       port_connections.clear ();
 }
 
 void
@@ -1058,6 +1198,7 @@ AudioEngine::remove_connections_for (Port& port)
        }
 }
 
+
 #ifdef HAVE_JACK_CLIENT_OPEN
 
 int
@@ -1068,23 +1209,13 @@ 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;
-               }
-               
+       if (_jack == NULL) {
                // error message is not useful here
                return -1;
        }
 
-       if (status & JackServerStarted) {
-               info << _("JACK server started") << endmsg;
-       }
-
        if (status & JackNameNotUnique) {
                jack_client_name = jack_get_client_name (_jack);
        }
@@ -1101,7 +1232,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;
        }
 
@@ -1113,11 +1244,20 @@ AudioEngine::connect_to_jack (string client_name)
 int 
 AudioEngine::disconnect_from_jack ()
 {
-       if (_jack == 0) {
+       if (!_jack) {
                return 0;
        }
 
-       jack_client_close (_jack);
+
+       if (_running) {
+               stop_metering_thread ();
+       }
+
+       { 
+               Glib::Mutex::Lock lm (_process_lock);
+               jack_client_close (_jack);
+               _jack = 0;
+       }
 
        _buffer_size = 0;
        _frame_rate = 0;
@@ -1127,14 +1267,13 @@ 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 */
                Glib::usleep (250000);
@@ -1150,7 +1289,6 @@ AudioEngine::reconnect_to_jack ()
        boost::shared_ptr<Ports> p = ports.reader ();
 
        for (i = p->begin(); i != p->end(); ++i) {
-
                if ((*i)->reestablish ()) {
                        break;
                } 
@@ -1195,21 +1333,14 @@ AudioEngine::reconnect_to_jack ()
 
        /* re-establish connections */
        
-       for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ++i) {
-               
-               int err;
-               
-               if ((err = jack_connect (_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)
-                                     << endmsg;
-                       }
-               }
+       for (i = p->begin(); i != p->end(); ++i) {
+               (*i)->reconnect ();
        }
 
        Running (); /* EMIT SIGNAL*/
 
+       start_metering_thread ();
+
        return 0;
 }
 
@@ -1233,7 +1364,9 @@ void
 AudioEngine::update_total_latencies ()
 {
 #ifdef HAVE_JACK_RECOMPUTE_LATENCIES
-       jack_recompute_total_latencies (_jack);
+       if (_jack) {
+               jack_recompute_total_latencies (_jack);
+       }
 #endif
 }