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

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index 1e26985..d1cfea2 100644
--- a/futatabi/midi_mapper.cpp
+++ b/futatabi/midi_mapper.cpp
@@ -141,6 +141,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) {
@@ -228,6 +230,9 @@ void MIDIMapper::update_lights_lock_held()
 	if (play_enabled_light) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayEnabledFieldNumber, &active_lights);
 	}
+	if (locked_light) {
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedFieldNumber, &active_lights);
+	}
 	if (current_highlighted_camera >= 0 && current_highlighted_camera < mapping_proto->camera_size()) {
 		const CameraMIDIMappingProto &camera = mapping_proto->camera(current_highlighted_camera);
 		activate_mapped_light(camera, CameraMIDIMappingProto::kIsCurrentFieldNumber, &active_lights);