diff options
| author | Robin Gareus <robin@gareus.org> | 2018-03-29 18:15:20 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2018-03-29 18:15:20 +0200 |
| commit | 37df98d0af21525ee8f260fd4261fb2a2eca42b7 (patch) | |
| tree | 60d9207bde75141675b9bfca2a676ec799fe1076 | |
| parent | 5132a6c2ebfe2559535919d87e73c4e5a58228c7 (diff) | |
CoreAudio/MIDI: add locks for port-registration
CoreMIDI ports are dynamic. When dis/connecting a device CoreAudio's
AudioHardware-PropertyListener triggers a callback which can
add/remove ports.
This can not happen concurrently with processing, but it may happen
concurrently with a user creating tracks using Ardour's UI
and/or session-load/setup.
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.cc | 8 | ||||
| -rw-r--r-- | libs/backends/coreaudio/coreaudio_backend.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/libs/backends/coreaudio/coreaudio_backend.cc b/libs/backends/coreaudio/coreaudio_backend.cc index ce7f833e57..8480686416 100644 --- a/libs/backends/coreaudio/coreaudio_backend.cc +++ b/libs/backends/coreaudio/coreaudio_backend.cc @@ -110,6 +110,7 @@ CoreAudioBackend::CoreAudioBackend (AudioEngine& e, AudioBackendInfo& info) { _instance_name = s_instance_name; pthread_mutex_init (&_port_callback_mutex, 0); + pthread_mutex_init (&_port_registration_mutex, 0); pthread_mutex_init (&_process_callback_mutex, 0); pthread_mutex_init (&_freewheel_mutex, 0); pthread_cond_init (&_freewheel_signal, 0); @@ -128,6 +129,7 @@ CoreAudioBackend::~CoreAudioBackend () delete _pcmio; _pcmio = 0; delete _midiio; _midiio = 0; pthread_mutex_destroy (&_port_callback_mutex); + pthread_mutex_destroy (&_port_registration_mutex); pthread_mutex_destroy (&_process_callback_mutex); pthread_mutex_destroy (&_freewheel_mutex); pthread_cond_destroy (&_freewheel_signal); @@ -938,8 +940,10 @@ CoreAudioBackend::set_port_name (PortEngine::PortHandle port, const std::string& } CoreBackendPort* p = static_cast<CoreBackendPort*>(port); + pthread_mutex_lock (&_port_registration_mutex); _portmap.erase (p->name()); _portmap.insert (make_pair (newname, p)); + pthread_mutex_unlock (&_port_registration_mutex); return p->set_name (newname); } @@ -1066,8 +1070,10 @@ CoreAudioBackend::add_port ( return 0; } + pthread_mutex_lock (&_port_registration_mutex); _ports.insert (port); _portmap.insert (make_pair (name, port)); + pthread_mutex_unlock (&_port_registration_mutex); return port; } @@ -1085,8 +1091,10 @@ CoreAudioBackend::unregister_port (PortEngine::PortHandle port_handle) return; } disconnect_all(port_handle); + pthread_mutex_lock (&_port_registration_mutex); _portmap.erase (port->name()); _ports.erase (i); + pthread_mutex_unlock (&_port_registration_mutex); delete port; } diff --git a/libs/backends/coreaudio/coreaudio_backend.h b/libs/backends/coreaudio/coreaudio_backend.h index d1d6e97189..b0a9727ae3 100644 --- a/libs/backends/coreaudio/coreaudio_backend.h +++ b/libs/backends/coreaudio/coreaudio_backend.h @@ -485,6 +485,7 @@ class CoreAudioBackend : public AudioBackend { std::vector<PortConnectData *> _port_connection_queue; pthread_mutex_t _port_callback_mutex; + pthread_mutex_t _port_registration_mutex; bool _port_change_flag; void port_connect_callback (const std::string& a, const std::string& b, bool conn) { |