X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=shared%2Fmidi_device.h;h=9c76d18b9d1a667c18cf2111f9fc36d4ac63ee80;hb=873c8b204ab70622f6e231556cc94d3aab1889ce;hp=498443931ab368ba931d2ead88192a969a27b116;hpb=beead04c23b42c815f448cd0126d87f9627bbfde;p=nageru diff --git a/shared/midi_device.h b/shared/midi_device.h index 4984439..9c76d18 100644 --- a/shared/midi_device.h +++ b/shared/midi_device.h @@ -7,7 +7,6 @@ #include #include #include -#include #include typedef struct snd_seq_addr snd_seq_addr_t; @@ -33,7 +32,7 @@ public: ~MIDIDevice(); void start_thread(); - void update_lights(const std::set &active_lights) + void update_lights(const std::map &active_lights) { std::lock_guard lock(mu); update_lights_lock_held(active_lights); @@ -43,7 +42,7 @@ private: void thread_func(); void handle_event(snd_seq_t *seq, snd_seq_event_t *event); void subscribe_to_port_lock_held(snd_seq_t *seq, const snd_seq_addr_t &addr); - void update_lights_lock_held(const std::set &active_lights); + void update_lights_lock_held(const std::map &active_lights); std::atomic should_quit{false}; int should_quit_fd; @@ -52,7 +51,7 @@ private: MIDIReceiver *receiver; // Under . std::thread midi_thread; - std::map current_light_status; // Keyed by note number. Under . + std::map current_light_status; // Keyed by note number. Under . snd_seq_t *alsa_seq{nullptr}; // Under . int alsa_queue_id{-1}; // Under . std::atomic num_subscribed_ports{0};