X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=cc74b92a6942c464aec4596d237bf61f28e58c96;hb=f33c92e0c9e9fe30fcc009c27b5a51b08e5d8cef;hp=87866e7b31591c6eeeedca196ed9b948e221458e;hpb=eb3f77df5748e81c4a6bfe737cd9b5a3d721a86c;p=ardour.git diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 87866e7b31..cc74b92a69 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -15,24 +15,23 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id$ */ #include #include #include +#include #include #include +#include #include +#include #include #include #include #include -#ifdef VST_SUPPORT -#include -#endif #include @@ -40,11 +39,19 @@ using namespace std; using namespace ARDOUR; +using namespace PBD; + +gint AudioEngine::m_meter_exit; -jack_nframes_t Port::short_over_length = 2; -jack_nframes_t Port::long_over_length = 10; +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) { session = 0; session_remove_pending = false; @@ -53,34 +60,34 @@ 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; - - m_meter_thread = 0; - m_meter_exit = false; + _freewheeling = false; + + m_meter_thread = 0; + g_atomic_int_set (&m_meter_exit, 0); - start_metering_thread(); - 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 (); } - - if(m_meter_thread) { - g_atomic_int_inc(&m_meter_exit); - } } void @@ -90,22 +97,23 @@ _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 () { + if (!_jack) { + error << _("AudioEngine::start() called while disconnected from JACK") << endmsg; + return -1; + } + if (!_running) { if (session) { - jack_nframes_t blocksize = jack_get_buffer_size (_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)); @@ -146,40 +154,65 @@ AudioEngine::start () _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 */ + if (_jack) { + if (forever) { + disconnect_from_jack (); + } else { + jack_deactivate (_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) + jack_position_t pos; + + if (_jack) { + (void) jack_transport_query (_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 (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); } } @@ -193,29 +226,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(arg)->Xrun (); /* EMIT SIGNAL */ + AudioEngine* ae = static_cast (arg); + if (ae->connected()) { + ae->Xrun (); /* EMIT SIGNAL */ + } return 0; } int AudioEngine::_graph_order_callback (void *arg) { - static_cast(arg)->GraphReordered (); /* EMIT SIGNAL */ + AudioEngine* ae = static_cast (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 (arg)->process_callback (nframes); } @@ -227,11 +266,12 @@ AudioEngine::_freewheel_callback (int onoff, void *arg) } int -AudioEngine::process_callback (jack_nframes_t nframes) +AudioEngine::process_callback (nframes_t nframes) { + // CycleTimer ct ("AudioEngine::process"); Glib::Mutex::Lock tm (_process_lock, Glib::TRY_LOCK); - jack_nframes_t next_processed_frames; - + nframes_t next_processed_frames; + /* handle wrap around of total frames counter */ if (max_frames - _processed_frames < nframes) { @@ -255,7 +295,6 @@ AudioEngine::process_callback (jack_nframes_t nframes) if (_freewheeling) { if (Freewheel (nframes)) { - _freewheeling = false; jack_set_freewheel (_jack, false); } return 0; @@ -273,13 +312,16 @@ AudioEngine::process_callback (jack_nframes_t nframes) } if (last_monitor_check + monitor_check_interval < next_processed_frames) { - for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) { + + boost::shared_ptr 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 ... */ @@ -289,18 +331,35 @@ AudioEngine::process_callback (jack_nframes_t nframes) last_monitor_check = next_processed_frames; } + if (session->silent()) { + + boost::shared_ptr 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 (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); @@ -320,19 +379,21 @@ 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 (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) { + boost::shared_ptr p = ports.reader(); + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { (*i)->reset(); } @@ -343,29 +404,61 @@ 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) { - m_meter_thread = Glib::Thread::create (sigc::mem_fun(this, &AudioEngine::meter_thread), false); - } + 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 (g_atomic_int_get(&m_meter_exit) != true) { - Glib::usleep (10000); /* 1/100th sec interval */ - IO::update_meters (); + while (true) { + Glib::usleep (10000); /* 1/100th sec interval */ + if (g_atomic_int_get(&m_meter_exit)) { + break; + } + IO::update_meters (); } - return; } 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); } } @@ -379,55 +472,75 @@ AudioEngine::remove_session () if (session) { session_remove_pending = true; session_removed.wait(_process_lock); - } + } } else { - session = 0; - } 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 = 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) { 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 (_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 writer (ports); + boost::shared_ptr ps = writer.get_copy (); + ps->insert (ps->begin(), newport); + /* writer goes out of scope, forces update */ } + return newport; } else { - - _process_lock.unlock(); - 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) { 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; @@ -436,20 +549,31 @@ 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 (_jack, portname.c_str(), + type.to_jack_type(), JackPortIsOutput, 0)) != 0) { + + Port *newport = 0; + + { + RCUWriter writer (ports); + boost::shared_ptr ps = writer.get_copy (); + + newport = new Port (p); + ps->insert (ps->begin(), newport); + + /* writer goes out of scope, forces update */ + } + return newport; } else { - - _process_lock.unlock(); - throw PortRegistrationFailure (); + port_registration_failure (portname); } return 0; } + int AudioEngine::unregister_port (Port *port) { @@ -462,15 +586,23 @@ AudioEngine::unregister_port (Port *port) if (port) { - int ret = jack_port_unregister (_jack, port->port); + int ret = jack_port_unregister (_jack, port->_port); if (ret == 0) { - - for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) { - if ((*i) == port) { - ports.erase (i); - break; + + { + + RCUWriter writer (ports); + boost::shared_ptr 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); @@ -503,6 +635,10 @@ AudioEngine::connect (const string& source, const string& destination) if (ret == 0) { pair 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) @@ -553,7 +689,7 @@ AudioEngine::disconnect (Port *port) } } - int ret = jack_port_disconnect (_jack, port->port); + int ret = jack_port_disconnect (_jack, port->_port); if (ret == 0) { remove_connections_for (port); @@ -563,7 +699,7 @@ AudioEngine::disconnect (Port *port) } -jack_nframes_t +nframes_t AudioEngine::frame_rate () { if (_jack) { @@ -580,7 +716,7 @@ AudioEngine::frame_rate () } } -jack_nframes_t +nframes_t AudioEngine::frames_per_cycle () { if (_jack) { @@ -613,7 +749,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 pr = ports.reader(); + + for (Ports::iterator i = pr->begin(); i != pr->end(); ++i) { if (portname == (*i)->name()) { return (*i); } @@ -623,11 +761,20 @@ AudioEngine::get_port_by_name (const string& portname, bool keep) if ((p = jack_port_by_name (_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 writer (ports); + boost::shared_ptr ps = writer.get_copy (); + ps->insert (newport); + /* writer goes out of scope, forces update */ + } } + return newport; + } else { + return 0; } } @@ -649,19 +796,41 @@ AudioEngine::get_ports (const string& port_name_pattern, const string& type_name void AudioEngine::halted (void *arg) { - AudioEngine *ae = reinterpret_cast (arg); + AudioEngine* ae = static_cast (arg); + bool was_running = ae->_running; - ae->_running = false; - ae->_jack = 0; + ae->stop_metering_thread (); + ae->_running = false; ae->_buffer_size = 0; ae->_frame_rate = 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 +AudioEngine::n_physical_audio_outputs () const { const char ** ports; uint32_t i = 0; @@ -670,19 +839,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, JACK_DEFAULT_AUDIO_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_audio_inputs () const { const char ** ports; uint32_t i = 0; @@ -691,7 +859,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, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput)) == 0) { return 0; } @@ -702,24 +870,63 @@ AudioEngine::n_physical_inputs () const return i; } -string +void +AudioEngine::get_physical_audio_inputs (vector& ins) +{ + const char ** ports; + uint32_t i = 0; + + if (!_jack) { + return; + } + + if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsOutput)) == 0) { + return; + } + + if (ports) { + for (i = 0; ports[i]; ++i) { + ins.push_back (ports[i]); + } + free (ports); + } +} + +void +AudioEngine::get_physical_audio_outputs (vector& outs) +{ + const char ** ports; + uint32_t i = 0; + + if (!_jack) { + return; + } + + if ((ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|JackPortIsInput)) == 0) { + return; + } + + if (ports) { + 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) { 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 ""; - } + if (!_jack) { + fatal << _("get_nth_physical called before engine was connected") << endmsg; + /*NOTREACHED*/ } - ports = jack_get_ports (_jack, NULL, NULL, JackPortIsPhysical|flag); + ports = jack_get_ports (_jack, NULL, JACK_DEFAULT_AUDIO_TYPE, JackPortIsPhysical|flag); if (ports == 0) { return ""; @@ -736,7 +943,7 @@ AudioEngine::get_nth_physical (uint32_t n, int flag) return ret; } -jack_nframes_t +nframes_t AudioEngine::get_port_total_latency (const Port& port) { if (!_jack) { @@ -744,20 +951,12 @@ AudioEngine::get_port_total_latency (const Port& port) /*NOTREACHED*/ } - 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 (_jack, port._port); } void AudioEngine::transport_stop () { - // cerr << "tell JACK to stop\n"; if (_jack) { jack_transport_stop (_jack); } @@ -766,14 +965,13 @@ AudioEngine::transport_stop () void AudioEngine::transport_start () { - // cerr << "tell JACK to start\n"; if (_jack) { jack_transport_start (_jack); } } void -AudioEngine::transport_locate (jack_nframes_t where) +AudioEngine::transport_locate (nframes_t where) { // cerr << "tell JACK to locate to " << where << endl; if (_jack) { @@ -811,11 +1009,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; @@ -828,12 +1033,19 @@ AudioEngine::remove_all_ports () /* process lock MUST be held */ if (_jack) { - for (Ports::iterator i = ports.begin(); i != ports.end(); ++i) { - jack_port_unregister (_jack, (*i)->port); + boost::shared_ptr p = ports.reader(); + + for (Ports::iterator i = p->begin(); i != p->end(); ++i) { + jack_port_unregister (_jack, (*i)->_port); } } - ports.clear (); + { + RCUWriter writer (ports); + boost::shared_ptr ps = writer.get_copy (); + ps->clear (); + } + port_connections.clear (); } @@ -864,26 +1076,18 @@ 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; - } - if (status & JackNameNotUnique) { jack_client_name = jack_get_client_name (_jack); } + + jack_set_error_function (ardour_jack_error); return 0; } @@ -895,7 +1099,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; } @@ -907,12 +1111,19 @@ AudioEngine::connect_to_jack (string client_name) int AudioEngine::disconnect_from_jack () { - if (_jack == 0) { + if (!_jack) { return 0; } - if (jack_client_close (_jack)) { - error << _("cannot shutdown connection to JACK") << endmsg; + + if (_running) { + stop_metering_thread (); + } + + { + Glib::Mutex::Lock lm (_process_lock); + jack_client_close (_jack); + _jack = 0; } _buffer_size = 0; @@ -923,17 +1134,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 */ - Glib::usleep (250000); + Glib::usleep (250000); } if (connect_to_jack (jack_client_name)) { @@ -943,7 +1153,9 @@ AudioEngine::reconnect_to_jack () Ports::iterator i; - for (i = ports.begin(); i != ports.end(); ++i) { + boost::shared_ptr p = ports.reader (); + + for (i = p->begin(); i != p->end(); ++i) { /* XXX hack hack hack */ @@ -952,7 +1164,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 (_jack, short_name.c_str(), (*i)->type(), (*i)->flags(), 0)) == 0) { error << string_compose (_("could not reregister %1"), (*i)->name()) << endmsg; break; } else { @@ -965,16 +1177,18 @@ AudioEngine::reconnect_to_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 (_jack, (*i)->_port); } return -1; } if (session) { - jack_nframes_t blocksize = jack_get_buffer_size (_jack); + session->reset_jack_connection (_jack); + nframes_t blocksize = jack_get_buffer_size (_jack); session->set_block_size (blocksize); session->set_frame_rate (jack_get_sample_rate (_jack)); } @@ -993,7 +1207,7 @@ AudioEngine::reconnect_to_jack () if (Config->get_jack_time_master()) { jack_set_timebase_callback (_jack, 0, _jack_timebase_callback, this); - } + } if (jack_activate (_jack) == 0) { _running = true; @@ -1007,8 +1221,16 @@ AudioEngine::reconnect_to_jack () for (PortConnections::iterator i = port_connections.begin(); i != port_connections.end(); ++i) { int err; + jack_client_t* j = _jack; + + /* JACK could have zombified us. */ + + if (!j) { + 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 (j, (*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) @@ -1019,15 +1241,22 @@ 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; + + if (nframes == jack_get_buffer_size (_jack)) { + return 0; + } + + return jack_set_buffer_size (_jack, nframes); + } else { return -1; } @@ -1037,7 +1266,9 @@ void AudioEngine::update_total_latencies () { #ifdef HAVE_JACK_RECOMPUTE_LATENCIES - jack_recompute_total_latencies (_jack); + if (_jack) { + jack_recompute_total_latencies (_jack); + } #endif } @@ -1078,3 +1309,12 @@ AudioEngine::make_port_name_non_relative (string portname) return str; } +bool +AudioEngine::is_realtime () const +{ + if (_jack) { + return jack_is_realtime (_jack); + } else { + return false; + } +}