Fix MIDI selection/tool issues (issue #0002415 and other bugs).

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

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 69502f9922eace5b535861272c3e44fb0b2adfca..8bbed4673346229158aaaf8d7fb98238e2fab53f 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -29,6 +29,8 @@
 #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>
@@ -82,9 +84,6 @@ AudioEngine::AudioEngine (string client_name)
        if (connect_to_jack (client_name)) {
                throw NoBackendAvailable ();
        }
-
-       start_metering_thread();
-
        Port::set_engine (this);
 }
 
@@ -116,6 +115,7 @@ _thread_init_callback (void *arg)
        */
 
        PBD::ThreadCreatedWithRequestSize (pthread_self(), X_("Audioengine"), 4096);
+       MIDI::JACK_MidiPort::set_process_thread (pthread_self());
 }
 
 int
@@ -126,6 +126,8 @@ AudioEngine::start ()
                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));
 
@@ -167,6 +169,8 @@ AudioEngine::start ()
                } else {
                        // error << _("cannot activate JACK client") << endmsg;
                }
+
+               start_metering_thread();
        }
 
        return _running ? 0 : -1;
@@ -177,11 +181,11 @@ AudioEngine::stop (bool forever)
 {
        if (_running) {
                _running = false;
+               stop_metering_thread ();
                if (forever) {
                        jack_client_t* foo = _jack;
                        _jack = 0;
                        jack_client_close (foo);
-                       stop_metering_thread ();
                } else {
                        jack_deactivate (_jack);
                }
@@ -453,8 +457,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);
        }
 }
 
@@ -522,7 +527,8 @@ AudioEngine::remove_session ()
                session = 0;
        }
        
-       remove_all_ports ();
+       //FIXME: Preliminary bugfix for  http://tracker.ardour.org/view.php?id=1985
+       //remove_all_ports ();
 }
 
 void
@@ -550,6 +556,7 @@ AudioEngine::register_port (DataType dtype, const string& portname, bool input,
 {
        Port* newport = 0;
 
+       /*cerr << "trying to register port with name " << portname << endl;*/
        try {
                if (dtype == DataType::AUDIO) {
                        newport = new AudioPort (portname, (input ? Port::IsInput : Port::IsOutput), publish, frames_per_cycle());
@@ -559,9 +566,15 @@ AudioEngine::register_port (DataType dtype, const string& portname, bool input,
                        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;
@@ -578,6 +591,7 @@ 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) {
+               //cerr << "comparing port name '" << (*i)->name() << "' with '" << full_name << "'" << endl;
                if ((*i)->name() == full_name) {
                        return *i;
                }
@@ -603,22 +617,31 @@ 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) {
+                               cerr << "About to delete " << &port << endl;
                                delete *i;
                                ps->erase (i);
+                               cerr << "After erasing ports size: " << ps->size();
                                break;
                        }
                }
@@ -626,6 +649,7 @@ AudioEngine::unregister_port (Port& port)
                /* writer goes out of scope, forces update */
        }
                
+       cerr << "before remove_connections\n";
        remove_connections_for (port);
 
        return 0;
@@ -648,6 +672,8 @@ AudioEngine::connect (const string& source, const string& destination)
        string s = make_port_name_non_relative (source);
        string d = make_port_name_non_relative (destination);
                
+       //cerr << "Trying to connect source: " << s << " with destination " << d << endl;
+       
        Port* src = get_port (s);
        Port* dst = get_port (d);
 
@@ -718,6 +744,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);
 
+       //cerr << "trying to disconnect port '" << s << "' from port '" << d << endl;
+       
        Port* src = get_port (s);
        Port* dst = get_port (d);
 
@@ -857,15 +885,39 @@ 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 */
+       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
 {
@@ -880,10 +932,9 @@ AudioEngine::n_physical_outputs () const
                return 0;
        }
 
-       if (ports) {
-               for (i = 0; ports[i]; ++i);
-               free (ports);
-       }
+       for (i = 0; ports[i]; ++i);
+       free (ports);
+
        return i;
 }
 
@@ -1173,6 +1224,7 @@ AudioEngine::disconnect_from_jack ()
        _frame_rate = 0;
 
        if (_running) {
+               stop_metering_thread ();
                _running = false;
                Stopped(); /* EMIT SIGNAL */
        }
@@ -1250,6 +1302,8 @@ AudioEngine::reconnect_to_jack ()
 
        Running (); /* EMIT SIGNAL*/
 
+       start_metering_thread ();
+
        return 0;
 }