X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmidi_mapper.h;h=dd5c7ab33a7bf957adf3da5d12264f0a4f11c39b;hb=55797f91bcb5ff2b45a1a8961ffe92a4c7f98763;hp=3d7a341f96bd0ad193213e753181805364d82023;hpb=4a90022f4e25a0189df638a9aba89238e6a9a4ce;p=nageru

diff --git a/nageru/midi_mapper.h b/nageru/midi_mapper.h
index 3d7a341..dd5c7ab 100644
--- a/nageru/midi_mapper.h
+++ b/nageru/midi_mapper.h
@@ -13,12 +13,11 @@
 #include <map>
 #include <memory>
 #include <mutex>
-#include <set>
 #include <string>
 #include <thread>
 
 #include "defs.h"
-#include "midi_device.h"
+#include "shared/midi_device.h"
 
 class MIDIMappingProto;
 
@@ -110,11 +109,9 @@ private:
 	void update_highlights();
 
 	void update_lights_lock_held();
-	void activate_lights(unsigned bus_idx, int field_number, std::set<unsigned> *active_lights);
-	void activate_lights_all_buses(int field_number, std::set<unsigned> *active_lights);
+	void activate_lights_all_buses(int field_number, std::map<MIDIDevice::LightKey, uint8_t> *active_lights);
 
 	std::atomic<bool> should_quit{false};
-	int should_quit_fd;
 
 	std::atomic<bool> has_peaked[MAX_BUSES] {{ false }};