// The sequencer object is now ready to be used from other threads.
{
- lock_guard<mutex> lock(mu);
+ lock_guard<recursive_mutex> lock(mu);
alsa_seq = seq;
alsa_queue_id = queue_id;
}
while (snd_seq_query_next_port(seq, pinfo) >= 0) {
constexpr int mask = SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ;
if ((snd_seq_port_info_get_capability(pinfo) & mask) == mask) {
- lock_guard<mutex> lock(mu);
+ lock_guard<recursive_mutex> lock(mu);
subscribe_to_port_lock_held(seq, *snd_seq_port_info_get_addr(pinfo));
}
}
return;
}
- lock_guard<mutex> lock(mu);
+ lock_guard<recursive_mutex> lock(mu);
switch (event->type) {
case SND_SEQ_EVENT_CONTROLLER: {
receiver->controller_received(event->data.control.param, event->data.control.value);
void update_lights(const std::map<LightKey, uint8_t> &active_lights)
{
- std::lock_guard<std::mutex> lock(mu);
+ std::lock_guard<std::recursive_mutex> lock(mu);
update_lights_lock_held(active_lights);
}
std::atomic<bool> should_quit{false};
int should_quit_fd;
- mutable std::mutex mu;
+ mutable std::recursive_mutex mu; // Recursive because the MIDI receiver may update_lights() back while we are sending it stuff.
MIDIReceiver *receiver; // Under <mu>.
std::thread midi_thread;