don't display internal returns to user

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

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 7a3c279705f8caa3daff8bca1d56b5d9f8370981..32ebe1643edecfe579c0387953d7df058d45092b 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -847,8 +847,6 @@ AudioEngine::unregister_port (Port& port)
 int
 AudioEngine::connect (const string& source, const string& destination)
 {
-       /* caller must hold process lock */
-
        int ret;
 
        if (!_running) {
@@ -864,8 +862,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);
+       Port* src = get_port_by_name (s);
+       Port* dst = get_port_by_name (d);
 
        if (src) {
                ret = src->connect (d);
@@ -890,8 +888,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 +902,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);
+       Port* src = get_port_by_name (s);
+       Port* dst = get_port_by_name (d);
 
        if (src) {
                        ret = src->disconnect (d);
@@ -974,30 +970,22 @@ 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)
-{
-       /* 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;
                }
        }
 
+       if (portname.find_first_of (':') == string::npos) {
+               s = make_port_name_non_relative (portname);
+       } else {
+               s = portname;
+       }
+
        if (portname.substr (0, jack_client_name.length ()) != jack_client_name) {
                /* not an ardour: port */
                return 0;
@@ -1477,19 +1465,18 @@ AudioEngine::is_realtime () const
        return jack_is_realtime (_priv_jack);
 }
 
-pthread_t
-AudioEngine::create_process_thread (boost::function<void()> f, size_t stacksize)
+int
+AudioEngine::create_process_thread (boost::function<void()> f, pthread_t* thread, size_t stacksize)
 {
         GET_PRIVATE_JACK_POINTER_RET (_jack, 0);
-        pthread_t thread;
         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 thread;
+        return 0;
 }
 
 void*