smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

CoreAudio/MIDI: add locks for port-registration

Browse source 
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.
This commit is contained in:
Robin Gareus 2018-03-29 18:15:20 +02:00
parent 5132a6c2eb
commit 37df98d0af
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libs/backends/coreaudio/coreaudio_backend.cc
View file

@ -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;
}

1
libs/backends/coreaudio/coreaudio_backend.h
View file

@ -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) {