X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=f215eaae82feda78346c4a8404bc94376013e0e2;hb=47b1f0869bb1255401d50f2c13b37221b9019af8;hp=71b0fabea0456cb4e54b0d721f05fba9cd580f16;hpb=582138f280b7c7d1620b31b27398459e1be84ae2;p=ardour.git diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index 71b0fabea0..f215eaae82 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -52,17 +53,23 @@ #include "ardour/mtdm.h" #include "ardour/port.h" #include "ardour/process_thread.h" +#include "ardour/rc_configuration.h" #include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; using namespace PBD; -gint AudioEngine::m_meter_exit; AudioEngine* AudioEngine::_instance = 0; +static gint audioengine_thread_cnt = 1; + +#ifdef SILENCE_AFTER +#define SILENCE_AFTER_SECONDS 600 +#endif + AudioEngine::AudioEngine () : session_remove_pending (false) , session_removal_countdown (-1) @@ -83,27 +90,32 @@ AudioEngine::AudioEngine () , _stopped_for_latency (false) , _started_for_latency (false) , _in_destructor (false) - , _hw_reset_event_thread(0) - , _hw_reset_request_count(0) - , _stop_hw_reset_processing(0) - , _hw_devicelist_update_thread(0) - , _hw_devicelist_update_count(0) - , _stop_hw_devicelist_processing(0) -{ - g_atomic_int_set (&m_meter_exit, 0); - start_hw_event_processing(); + , _last_backend_error_string(AudioBackend::get_error_string((AudioBackend::ErrorCode)-1)) + , _hw_reset_event_thread(0) + , _hw_reset_request_count(0) + , _stop_hw_reset_processing(0) + , _hw_devicelist_update_thread(0) + , _hw_devicelist_update_count(0) + , _stop_hw_devicelist_processing(0) +#ifdef SILENCE_AFTER_SECONDS + , _silence_countdown (0) + , _silence_hit_cnt (0) +#endif +{ + reset_silence_countdown (); + start_hw_event_processing(); discover_backends (); } AudioEngine::~AudioEngine () { _in_destructor = true; - stop_metering_thread (); stop_hw_event_processing(); drop_backend (); for (BackendMap::const_iterator i = _backends.begin(); i != _backends.end(); ++i) { i->second->deinstantiate(); } + delete _main_thread; } AudioEngine* @@ -114,7 +126,7 @@ AudioEngine::create () } _instance = new AudioEngine (); - + return _instance; } @@ -148,10 +160,14 @@ AudioEngine::sample_rate_change (pframes_t nframes) SampleRateChanged (nframes); /* EMIT SIGNAL */ +#ifdef SILENCE_AFTER_SECONDS + _silence_countdown = nframes * SILENCE_AFTER_SECONDS; +#endif + return 0; } -int +int AudioEngine::buffer_size_change (pframes_t bufsiz) { if (_session) { @@ -191,20 +207,48 @@ AudioEngine::process_callback (pframes_t nframes) if (!tm.locked()) { /* return having done nothing */ - _processed_frames = next_processed_frames; + if (_session) { + Xrun(); + } + /* really only JACK requires this + * (other backends clear the output buffers + * before the process_callback. it may even be + * jack/alsa only). but better safe than sorry. + */ + PortManager::silence_outputs (nframes); return 0; } + /* The coreaudio-backend calls thread_init_callback() if + * the hardware changes or pthread_self() changes. + * + * However there are cases when neither holds true, yet + * the thread-pool changes: e.g. connect a headphone to + * a shared mic/headphone jack. + * It's probably related to, or caused by clocksource changes. + * + * For reasons yet unknown Glib::Threads::Private() can + * use a different thread-private in the same pthread + * (coreaudio render callback). + * + * Coreaudio must set something which influences + * pthread_key_t uniqness or reset the key using + * pthread_getspecific(). + */ + if (! SessionEvent::has_per_thread_pool ()) { + thread_init_callback (NULL); + } + bool return_after_remove_check = false; if (_measuring_latency == MeasureAudio && _mtdm) { /* run a normal cycle from the perspective of the PortManager so that we get silence on all registered ports. - + we overwrite the silence on the two ports used for latency measurement. */ - + PortManager::cycle_start (nframes); PortManager::silence (nframes); @@ -243,7 +287,7 @@ AudioEngine::process_callback (pframes_t nframes) return_after_remove_check = true; } else if (_latency_flush_frames) { - + /* wait for the appropriate duration for the MTDM signal to * drain from the ports before we revert to normal behaviour. */ @@ -251,12 +295,12 @@ AudioEngine::process_callback (pframes_t nframes) PortManager::cycle_start (nframes); PortManager::silence (nframes); PortManager::cycle_end (nframes); - - if (_latency_flush_frames > nframes) { - _latency_flush_frames -= nframes; - } else { - _latency_flush_frames = 0; - } + + if (_latency_flush_frames > nframes) { + _latency_flush_frames -= nframes; + } else { + _latency_flush_frames = 0; + } return_after_remove_check = true; } @@ -269,18 +313,18 @@ AudioEngine::process_callback (pframes_t nframes) /* fade out over 1 second */ session_removal_countdown = sample_rate()/2; - session_removal_gain = 1.0; + session_removal_gain = GAIN_COEFF_UNITY; session_removal_gain_step = 1.0/session_removal_countdown; } else if (session_removal_countdown > 0) { /* we'll be fading audio out. - - if this is the last time we do this as part + + if this is the last time we do this as part of session removal, do a MIDI panic now to get MIDI stopped. This relies on the fact that "immediate data" (aka "out of band data") from - MIDI tracks is *appended* after any other data, + MIDI tracks is *appended* after any other data, so that it emerges after any outbound note ons, etc. */ @@ -322,9 +366,9 @@ AudioEngine::process_callback (pframes_t nframes) PortManager::cycle_start (nframes); /* test if we are freewheeling and there are freewheel signals connected. - ardour should act normally even when freewheeling unless /it/ is - exporting (which is what Freewheel.empty() tests for). - */ + * ardour should act normally even when freewheeling unless /it/ is + * exporting (which is what Freewheel.empty() tests for). + */ if (_freewheeling && !Freewheel.empty()) { Freewheel (nframes); @@ -333,6 +377,7 @@ AudioEngine::process_callback (pframes_t nframes) } if (_freewheeling) { + PortManager::cycle_end (nframes); return 0; } @@ -342,19 +387,40 @@ AudioEngine::process_callback (pframes_t nframes) } if (last_monitor_check + monitor_check_interval < next_processed_frames) { - + PortManager::check_monitoring (); last_monitor_check = next_processed_frames; } - if (_session->silent()) { +#ifdef SILENCE_AFTER_SECONDS + + bool was_silent = (_silence_countdown == 0); + + if (_silence_countdown >= nframes) { + _silence_countdown -= nframes; + } else { + _silence_countdown = 0; + } + + if (!was_silent && _silence_countdown == 0) { + _silence_hit_cnt++; + BecameSilent (); /* EMIT SIGNAL */ + } + + if (_silence_countdown == 0 || _session->silent()) { PortManager::silence (nframes); } +#else + if (_session->silent()) { + PortManager::silence (nframes, _session); + } +#endif + if (session_remove_pending && session_removal_countdown) { PortManager::fade_out (session_removal_gain, session_removal_gain_step, nframes); - + if (session_removal_countdown > nframes) { session_removal_countdown -= nframes; } else { @@ -369,174 +435,169 @@ AudioEngine::process_callback (pframes_t nframes) _processed_frames = next_processed_frames; PT_TIMING_CHECK (2); - + return 0; } +void +AudioEngine::reset_silence_countdown () +{ +#ifdef SILENCE_AFTER_SECONDS + double sr = 48000; /* default in case there is no backend */ + + sr = sample_rate(); + + _silence_countdown = max (60 * sr, /* 60 seconds */ + sr * (SILENCE_AFTER_SECONDS / ::pow (2.0, (double) _silence_hit_cnt))); + +#endif +} + +void +AudioEngine::launch_device_control_app() +{ + if (_state_lock.trylock () ) { + _backend->launch_control_app (); + _state_lock.unlock (); + } +} + void AudioEngine::request_backend_reset() { - Glib::Threads::Mutex::Lock guard (_reset_request_lock); - g_atomic_int_inc (&_hw_reset_request_count); - _hw_reset_condition.signal (); + Glib::Threads::Mutex::Lock guard (_reset_request_lock); + g_atomic_int_inc (&_hw_reset_request_count); + _hw_reset_condition.signal (); } +int +AudioEngine::backend_reset_requested() +{ + return g_atomic_int_get (&_hw_reset_request_count); +} void AudioEngine::do_reset_backend() { - SessionEvent::create_per_thread_pool (X_("Backend reset processing thread"), 512); - - Glib::Threads::Mutex::Lock guard (_reset_request_lock); - - while (!_stop_hw_reset_processing) { - - if (_hw_reset_request_count && _backend) { + SessionEvent::create_per_thread_pool (X_("Backend reset processing thread"), 1024); + + Glib::Threads::Mutex::Lock guard (_reset_request_lock); + + while (!_stop_hw_reset_processing) { + + if (g_atomic_int_get (&_hw_reset_request_count) != 0 && _backend) { _reset_request_lock.unlock(); - - Glib::Threads::RecMutex::Lock pl (_state_lock); - g_atomic_int_dec_and_test (&_hw_reset_request_count); + Glib::Threads::RecMutex::Lock pl (_state_lock); + g_atomic_int_dec_and_test (&_hw_reset_request_count); - std::cout << "AudioEngine::RESET::Reset request processing" << std::endl; + std::cout << "AudioEngine::RESET::Reset request processing. Requests left: " << _hw_reset_request_count << std::endl; + DeviceResetStarted(); // notify about device reset to be started - // backup the device name - std::string name = _backend->device_name (); - - std::cout << "AudioEngine::RESET::Stoping engine..." << std::endl; - stop(); + // backup the device name + std::string name = _backend->device_name (); std::cout << "AudioEngine::RESET::Reseting device..." << std::endl; - if ( 0 == _backend->reset_device () ) { - - std::cout << "AudioEngine::RESET::Starting engine..." << std::endl; - start (); + if ( ( 0 == stop () ) && + ( 0 == _backend->reset_device () ) && + ( 0 == start () ) ) { + + std::cout << "AudioEngine::RESET::Engine started..." << std::endl; // inform about possible changes BufferSizeChanged (_backend->buffer_size() ); + DeviceResetFinished(); // notify about device reset finish + } else { + + DeviceResetFinished(); // notify about device reset finish + // we've got an error DeviceError(); } - + std::cout << "AudioEngine::RESET::Done." << std::endl; - _reset_request_lock.lock(); - - } else { - - _hw_reset_condition.wait (_reset_request_lock); - - } - } -} + _reset_request_lock.lock(); + } else { + + _hw_reset_condition.wait (_reset_request_lock); + + } + } +} void AudioEngine::request_device_list_update() { - Glib::Threads::Mutex::Lock guard (_devicelist_update_lock); - g_atomic_int_inc (&_hw_devicelist_update_count); - _hw_devicelist_update_condition.signal (); + Glib::Threads::Mutex::Lock guard (_devicelist_update_lock); + g_atomic_int_inc (&_hw_devicelist_update_count); + _hw_devicelist_update_condition.signal (); } - void AudioEngine::do_devicelist_update() { - SessionEvent::create_per_thread_pool (X_("Device list update processing thread"), 512); - - Glib::Threads::Mutex::Lock guard (_devicelist_update_lock); - - while (!_stop_hw_devicelist_processing) { - - if (_hw_devicelist_update_count) { + SessionEvent::create_per_thread_pool (X_("Device list update processing thread"), 512); - _devicelist_update_lock.unlock(); - - g_atomic_int_dec_and_test (&_hw_devicelist_update_count); - DeviceListChanged (); /* EMIT SIGNAL */ - - _devicelist_update_lock.lock(); - - } else { - _hw_devicelist_update_condition.wait (_devicelist_update_lock); - } - } -} + Glib::Threads::Mutex::Lock guard (_devicelist_update_lock); + while (!_stop_hw_devicelist_processing) { -void -AudioEngine::start_hw_event_processing() -{ - if (_hw_reset_event_thread == 0) { - g_atomic_int_set(&_hw_reset_request_count, 0); - g_atomic_int_set(&_stop_hw_reset_processing, 0); - _hw_reset_event_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::do_reset_backend, this)); - } - - if (_hw_devicelist_update_thread == 0) { - g_atomic_int_set(&_hw_devicelist_update_count, 0); - g_atomic_int_set(&_stop_hw_devicelist_processing, 0); - _hw_devicelist_update_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::do_devicelist_update, this)); - } -} + if (_hw_devicelist_update_count) { + _devicelist_update_lock.unlock(); -void -AudioEngine::stop_hw_event_processing() -{ - if (_hw_reset_event_thread) { - g_atomic_int_set(&_stop_hw_reset_processing, 1); - g_atomic_int_set(&_hw_reset_request_count, 0); - _hw_reset_condition.signal (); - _hw_reset_event_thread->join (); - _hw_reset_event_thread = 0; - } - - if (_hw_devicelist_update_thread) { - g_atomic_int_set(&_stop_hw_devicelist_processing, 1); - g_atomic_int_set(&_hw_devicelist_update_count, 0); - _hw_devicelist_update_condition.signal (); - _hw_devicelist_update_thread->join (); - _hw_devicelist_update_thread = 0; - } - -} + Glib::Threads::RecMutex::Lock pl (_state_lock); + g_atomic_int_dec_and_test (&_hw_devicelist_update_count); + DeviceListChanged (); /* EMIT SIGNAL */ + _devicelist_update_lock.lock(); -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; + } else { + _hw_devicelist_update_condition.wait (_devicelist_update_lock); + } } } + void -AudioEngine::start_metering_thread () +AudioEngine::start_hw_event_processing() { - if (m_meter_thread == 0) { - g_atomic_int_set (&m_meter_exit, 0); - m_meter_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::meter_thread, this)); + if (_hw_reset_event_thread == 0) { + g_atomic_int_set(&_hw_reset_request_count, 0); + g_atomic_int_set(&_stop_hw_reset_processing, 0); + _hw_reset_event_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::do_reset_backend, this)); + } + + if (_hw_devicelist_update_thread == 0) { + g_atomic_int_set(&_hw_devicelist_update_count, 0); + g_atomic_int_set(&_stop_hw_devicelist_processing, 0); + _hw_devicelist_update_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::do_devicelist_update, this)); } } + void -AudioEngine::meter_thread () +AudioEngine::stop_hw_event_processing() { - pthread_set_name (X_("meter")); + if (_hw_reset_event_thread) { + g_atomic_int_set(&_stop_hw_reset_processing, 1); + g_atomic_int_set(&_hw_reset_request_count, 0); + _hw_reset_condition.signal (); + _hw_reset_event_thread->join (); + _hw_reset_event_thread = 0; + } - while (true) { - Glib::usleep (10000); /* 1/100th sec interval */ - if (g_atomic_int_get(&m_meter_exit)) { - break; - } - Metering::Meter (); + if (_hw_devicelist_update_thread) { + g_atomic_int_set(&_stop_hw_devicelist_processing, 1); + g_atomic_int_set(&_hw_devicelist_update_count, 0); + _hw_devicelist_update_condition.signal (); + _hw_devicelist_update_thread->join (); + _hw_devicelist_update_thread = 0; } } @@ -575,7 +636,8 @@ AudioEngine::remove_session () if (_session) { session_remove_pending = true; - session_removal_countdown = 0; + /* signal the start of the fade out countdown */ + session_removal_countdown = -1; session_removed.wait(_process_lock); } @@ -590,20 +652,19 @@ AudioEngine::remove_session () void AudioEngine::reconnect_session_routes (bool reconnect_inputs, bool reconnect_outputs) { - if (_session) { - _session->reconnect_existing_routes(true, true, reconnect_inputs, reconnect_outputs); - } +#ifdef USE_TRACKS_CODE_FEATURES + if (_session) { + _session->reconnect_existing_routes(true, true, reconnect_inputs, reconnect_outputs); + } +#endif } void AudioEngine::died () { - /* called from a signal handler for SIGPIPE */ - - stop_metering_thread (); - - _running = false; + /* called from a signal handler for SIGPIPE */ + _running = false; } int @@ -695,13 +756,13 @@ AudioEngine::backend_discover (const string& path) Glib::Module::get_last_error()) << endmsg; return 0; } - + if (!module.get_symbol ("descriptor", func)) { error << string_compose(_("AudioEngine: backend at \"%1\" has no descriptor function."), path) << endmsg; error << Glib::Module::get_last_error() << endmsg; return 0; } - + dfunc = (AudioBackendInfo* (*)(void))func; info = dfunc(); if (!info->available()) { @@ -709,16 +770,30 @@ AudioEngine::backend_discover (const string& path) } module.make_resident (); - + return info; } +#ifdef NDEBUG +static bool running_from_source_tree () +{ + // dup ARDOUR_UI_UTILS::running_from_source_tree () + gchar const *x = g_getenv ("ARDOUR_THEMES_PATH"); + return x && (string (x).find ("gtk2_ardour") != string::npos); +} +#endif + vector AudioEngine::available_backends() const { vector r; - + for (BackendMap::const_iterator i = _backends.begin(); i != _backends.end(); ++i) { +#ifdef NDEBUG + if (i->first == "None (Dummy)" && !running_from_source_tree () && Config->get_hide_dummy_backend ()) { + continue; + } +#endif r.push_back (i->second); } @@ -730,7 +805,7 @@ AudioEngine::current_backend_name() const { if (_backend) { return _backend->name(); - } + } return string(); } @@ -738,7 +813,9 @@ void AudioEngine::drop_backend () { if (_backend) { - stop(false); + _backend->stop (); + // Stopped is needed for Graph to explicitly terminate threads + Stopped (); /* EMIT SIGNAL */ _backend->drop_device (); _backend.reset (); _running = false; @@ -765,12 +842,12 @@ AudioEngine::set_backend (const std::string& name, const std::string& arg1, cons } drop_backend (); - + try { if (b->second->instantiate (arg1, arg2)) { throw failed_constructor (); } - + _backend = b->second->factory (*this); } catch (exception& e) { @@ -796,64 +873,98 @@ AudioEngine::start (bool for_latency) _processed_frames = 0; last_monitor_check = 0; - - if (_backend->start (for_latency)) { + + int error_code = _backend->start (for_latency); + + if (error_code != 0) { + _last_backend_error_string = AudioBackend::get_error_string((AudioBackend::ErrorCode) error_code); return -1; } _running = true; - + if (_session) { _session->set_frame_rate (_backend->sample_rate()); - + if (_session->config.get_jack_time_master()) { _backend->set_time_master (true); } } - - start_metering_thread (); - + + /* XXX MIDI ports may not actually be available here yet .. */ + + PortManager::fill_midi_port_info (); + if (!for_latency) { Running(); /* EMIT SIGNAL */ } - + return 0; } int AudioEngine::stop (bool for_latency) { + bool stop_engine = true; + if (!_backend) { return 0; } - if (_session && _running) { + Glib::Threads::Mutex::Lock pl (_process_lock, Glib::Threads::NOT_LOCK); + + if (running()) { + pl.acquire (); + } + + if (for_latency && _backend->can_change_systemic_latency_when_running()) { + stop_engine = false; + if (_running) { + _backend->start (false); // keep running, reload latencies + } + } else { + if (_backend->stop ()) { + if (pl.locked ()) { + pl.release (); + } + return -1; + } + } + + if (pl.locked ()) { + pl.release (); + } + + if (_session && _running && stop_engine && + (_session->state_of_the_state() & Session::Loading) == 0 && + (_session->state_of_the_state() & Session::Deletion) == 0) { // it's not a halt, but should be handled the same way: // disable record, stop transport and I/O processign but save the data. _session->engine_halted (); } - Glib::Threads::Mutex::Lock lm (_process_lock); - - if (_backend->stop ()) { - return -1; + if (stop_engine && _running) { + _running = false; + if (!for_latency) { + _started_for_latency = false; + } else if (!_started_for_latency) { + _stopped_for_latency = true; + } } - - _running = false; _processed_frames = 0; _measuring_latency = MeasureNone; _latency_output_port = 0; _latency_input_port = 0; - _started_for_latency = false; - stop_metering_thread (); - - Port::PortDrop (); - if (!for_latency) { + if (stop_engine) { + Port::PortDrop (); + } + + if (stop_engine) { Stopped (); /* EMIT SIGNAL */ } - + return 0; } @@ -870,16 +981,16 @@ AudioEngine::freewheel (bool start_stop) } float -AudioEngine::get_dsp_load() const +AudioEngine::get_dsp_load() const { - if (!_backend) { + if (!_backend || !_running) { return 0.0; } return _backend->dsp_load (); } bool -AudioEngine::is_realtime() const +AudioEngine::is_realtime() const { if (!_backend) { return false; @@ -889,7 +1000,7 @@ AudioEngine::is_realtime() const } bool -AudioEngine::connected() const +AudioEngine::connected() const { if (!_backend) { return false; @@ -1066,6 +1177,7 @@ AudioEngine::set_sample_rate (float sr) if (!_backend) { return -1; } + return _backend->set_sample_rate (sr); } @@ -1123,6 +1235,12 @@ AudioEngine::set_systemic_output_latency (uint32_t ol) return _backend->set_systemic_output_latency (ol); } +bool +AudioEngine::thread_initialised_for_audio_processing () +{ + return SessionEvent::has_per_thread_pool () && AsyncMIDIPort::is_process_thread(); +} + /* END OF BACKEND PROXY API */ void @@ -1134,14 +1252,15 @@ AudioEngine::thread_init_callback (void* arg) pthread_set_name (X_("audioengine")); - PBD::notify_gui_about_thread_creation ("gui", pthread_self(), X_("AudioEngine"), 4096); - PBD::notify_gui_about_thread_creation ("midiui", pthread_self(), X_("AudioEngine"), 128); - - SessionEvent::create_per_thread_pool (X_("AudioEngine"), 512); + const int thread_num = g_atomic_int_add (&audioengine_thread_cnt, 1); + const string thread_name = string_compose (X_("AudioEngine %1"), thread_num); + SessionEvent::create_per_thread_pool (thread_name, 512); + PBD::notify_event_loops_about_thread_creation (pthread_self(), thread_name, 4096); AsyncMIDIPort::set_process_thread (pthread_self()); if (arg) { + delete AudioEngine::instance()->_main_thread; /* the special thread created/managed by the backend */ AudioEngine::instance()->_main_thread = new ProcessThread; } @@ -1165,9 +1284,9 @@ AudioEngine::freewheel_callback (bool onoff) void AudioEngine::latency_callback (bool for_playback) { - if (_session) { - _session->update_latency (for_playback); - } + if (_session) { + _session->update_latency (for_playback); + } } void @@ -1186,7 +1305,6 @@ AudioEngine::halted_callback (const char* why) return; } - stop_metering_thread (); _running = false; Port::PortDrop (); /* EMIT SIGNAL */ @@ -1207,33 +1325,47 @@ AudioEngine::setup_required () const return false; } } - + return true; } int AudioEngine::prepare_for_latency_measurement () { + if (!_backend) { + return -1; + } + + if (running() && _started_for_latency) { + return 0; + } + + if (_backend->can_change_systemic_latency_when_running()) { + if (_running) { + _backend->start (true); // zero latency reporting of running backend + } else if (start (true)) { + return -1; + } + _started_for_latency = true; + return 0; + } + if (running()) { - _stopped_for_latency = true; stop (true); } if (start (true)) { - _started_for_latency = true; return -1; } - + _started_for_latency = true; return 0; } int AudioEngine::start_latency_detection (bool for_midi) { - if (!running()) { - if (prepare_for_latency_measurement ()) { - return -1; - } + if (prepare_for_latency_measurement ()) { + return -1; } PortEngine& pe (port_engine()); @@ -1340,7 +1472,21 @@ AudioEngine::stop_latency_detection () _latency_input_port = 0; } - stop (true); + if (_running && _backend->can_change_systemic_latency_when_running()) { + if (_started_for_latency) { + _running = false; // force reload: reset latencies and emit Running() + start (); + } + } + + if (_running && !_started_for_latency) { + assert (!_stopped_for_latency); + return; + } + + if (!_backend->can_change_systemic_latency_when_running()) { + stop (true); + } if (_stopped_for_latency) { start (); @@ -1361,3 +1507,18 @@ AudioEngine::set_latency_input_port (const string& name) { _latency_input_name = name; } + +void +AudioEngine::add_pending_port_deletion (Port* p) +{ + if (_session) { + DEBUG_TRACE (DEBUG::Ports, string_compose ("adding %1 to pending port deletion list\n", p->name())); + if (_port_deletions_pending.write (&p, 1) != 1) { + error << string_compose (_("programming error: port %1 could not be placed on the pending deletion queue\n"), p->name()) << endmsg; + } + _session->auto_connect_thread_wakeup (); + } else { + DEBUG_TRACE (DEBUG::Ports, string_compose ("Directly delete port %1\n", p->name())); + delete p; + } +}