put automation list into or out of Touch mode before adding an automation watch,...

[ardour.git] / libs / ardour / audioengine.cc

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 004ba33a6e235e4bc98731cee347d927ff5bf765..69d232079ca79fa988f305f901eea064bd1668e6 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -93,8 +93,10 @@ AudioEngine::AudioEngine (string client_name, string session_uuid)
 
 AudioEngine::~AudioEngine ()
 {
+       config_connection.disconnect ();
+
        {
-               Glib::Mutex::Lock tm (_process_lock);
+               Glib::Threads::Mutex::Lock tm (_process_lock);
                session_removed.signal ();
 
                if (_running) {
@@ -374,31 +376,38 @@ void
 AudioEngine::_connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn, void* arg)
 {
        AudioEngine* ae = static_cast<AudioEngine*> (arg);
+       ae->connect_callback (id_a, id_b, conn);
+}
 
-       if (ae->port_remove_in_progress) {
+void
+AudioEngine::connect_callback (jack_port_id_t id_a, jack_port_id_t id_b, int conn)
+{
+       if (port_remove_in_progress) {
                return;
        }
 
-       GET_PRIVATE_JACK_POINTER (ae->_jack);
+       GET_PRIVATE_JACK_POINTER (_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;
+       Ports::iterator x;
+       boost::shared_ptr<Ports> pr = ports.reader ();
 
-       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;
+
+       x = pr->find (make_port_name_relative (jack_port_name (jack_port_a)));
+       if (x != pr->end()) {
+               port_a = x->second;
+       }
+
+       x = pr->find (make_port_name_relative (jack_port_name (jack_port_b)));
+       if (x != pr->end()) {
+               port_b = x->second;
        }
 
-       ae->PortConnectedOrDisconnected (
+       PortConnectedOrDisconnected (
                port_a, jack_port_name (jack_port_a),
                port_b, jack_port_name (jack_port_b),
                conn == 0 ? false : true
@@ -453,7 +462,7 @@ int
 AudioEngine::process_callback (pframes_t nframes)
 {
        GET_PRIVATE_JACK_POINTER_RET(_jack,0);
-       Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK);
+       Glib::Threads::Mutex::Lock tm (_process_lock, Glib::Threads::TRY_LOCK);
 
        PT_TIMING_REF;
        PT_TIMING_CHECK (1);
@@ -714,7 +723,7 @@ AudioEngine::jack_bufsize_callback (pframes_t nframes)
         }
 
        {
-               Glib::Mutex::Lock lm (_process_lock);
+               Glib::Threads::Mutex::Lock lm (_process_lock);
 
                boost::shared_ptr<Ports> p = ports.reader();
 
@@ -745,8 +754,7 @@ AudioEngine::start_metering_thread ()
 {
        if (m_meter_thread == 0) {
                g_atomic_int_set (&m_meter_exit, 0);
-               m_meter_thread = Glib::Thread::create (boost::bind (&AudioEngine::meter_thread, this),
-                                                      500000, true, true, Glib::THREAD_PRIORITY_NORMAL);
+               m_meter_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::meter_thread, this));
        }
 }
 
@@ -767,7 +775,7 @@ AudioEngine::meter_thread ()
 void
 AudioEngine::set_session (Session *s)
 {
-       Glib::Mutex::Lock pl (_process_lock);
+       Glib::Threads::Mutex::Lock pl (_process_lock);
 
        SessionHandlePtr::set_session (s);
 
@@ -805,7 +813,7 @@ AudioEngine::set_session (Session *s)
 void
 AudioEngine::remove_session ()
 {
-       Glib::Mutex::Lock lm (_process_lock);
+       Glib::Threads::Mutex::Lock lm (_process_lock);
 
        if (_running) {
 
@@ -1391,7 +1399,7 @@ AudioEngine::disconnect_from_jack ()
        }
 
        {
-               Glib::Mutex::Lock lm (_process_lock);
+               Glib::Threads::Mutex::Lock lm (_process_lock);
                jack_client_close (_priv_jack);
                _jack = 0;
        }
@@ -1611,3 +1619,4 @@ AudioEngine::destroy ()
        delete _instance;
        _instance = 0;
 }
+