X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.cpp;h=36a2e43f9224232570cc2f02d4e9b8168e5e4943;hb=686a02a3ffed47c099c1d91d95d0d90e222d297d;hp=1e26985a01537e226f21cedb7f9e789698648be6;hpb=2c9a83aeae44dae6a0bbfbae33719976e6d527af;p=nageru

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index 1e26985..36a2e43 100644
--- a/futatabi/midi_mapper.cpp
+++ b/futatabi/midi_mapper.cpp
@@ -16,6 +16,7 @@
 #include <unistd.h>
 #include <algorithm>
 #include <functional>
+#include <map>
 #include <thread>
 
 #include "defs.h"
@@ -141,6 +142,8 @@ void MIDIMapper::note_on_received(int note)
 		bind(&ControllerReceiver::queue, receiver));
 	match_button(note, MIDIMappingProto::kPlayFieldNumber, MIDIMappingProto::kPlayBankFieldNumber,
 		bind(&ControllerReceiver::play, receiver));
+	match_button(note, MIDIMappingProto::kToggleLockFieldNumber, MIDIMappingProto::kToggleLockBankFieldNumber,
+		bind(&ControllerReceiver::toggle_lock, receiver));
 
 	unsigned num_cameras = std::min(MAX_STREAMS, mapping_proto->camera_size());
 	for (unsigned camera_idx = 0; camera_idx < num_cameras; ++camera_idx) {
@@ -203,7 +206,7 @@ void MIDIMapper::refresh_lights()
 
 void MIDIMapper::update_lights_lock_held()
 {
-	set<unsigned> active_lights;  // Desired state.
+	map<unsigned, uint8_t> active_lights;  // Desired state.
 	if (current_controller_bank == 0) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kBank1IsSelectedFieldNumber, &active_lights);
 	}
@@ -219,14 +222,23 @@ void MIDIMapper::update_lights_lock_held()
 	if (current_controller_bank == 4) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kBank5IsSelectedFieldNumber, &active_lights);
 	}
-	if (preview_enabled_light) {
-		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewEnabledFieldNumber, &active_lights);
+	if (preview_enabled_light == On) {  // Playing.
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewPlayingFieldNumber, &active_lights);
+	} else if (preview_enabled_light == Blinking) {  // Preview ready.
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewReadyFieldNumber, &active_lights);
 	}
 	if (queue_enabled_light) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kQueueEnabledFieldNumber, &active_lights);
 	}
-	if (play_enabled_light) {
-		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayEnabledFieldNumber, &active_lights);
+	if (play_enabled_light == On) {  // Playing.
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayingFieldNumber, &active_lights);
+	} else if (play_enabled_light == Blinking) {  // Play ready.
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayReadyFieldNumber, &active_lights);
+	}
+	if (locked_light == On) {
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedFieldNumber, &active_lights);
+	} else if (locked_light == Blinking) {
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedBlinkingFieldNumber, &active_lights);
 	}
 	if (current_highlighted_camera >= 0 && current_highlighted_camera < mapping_proto->camera_size()) {
 		const CameraMIDIMappingProto &camera = mapping_proto->camera(current_highlighted_camera);
@@ -234,8 +246,8 @@ void MIDIMapper::update_lights_lock_held()
 	}
 
 	// These are always enabled right now.
-	activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueInFieldNumber, &active_lights);
-	activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueOutFieldNumber, &active_lights);
+	activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueInEnabledFieldNumber, &active_lights);
+	activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueOutEnabledFieldNumber, &active_lights);
 
 	midi_device.update_lights(active_lights);
 }