X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.cpp;h=1d5d79e4ba85e9d9388f73bd94ecdc60d7840281;hb=9921f1fe12f5a7dadab7e84069fa8591d5c5663d;hp=849c72c7e1f4dd399096fc7b372d13283c37ebcf;hpb=873c8b204ab70622f6e231556cc94d3aab1889ce;p=nageru

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index 849c72c..1d5d79e 100644
--- a/futatabi/midi_mapper.cpp
+++ b/futatabi/midi_mapper.cpp
@@ -8,6 +8,7 @@
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/message.h>
 #include <google/protobuf/text_format.h>
+#include <math.h>
 #include <pthread.h>
 #include <poll.h>
 #include <stdint.h>
@@ -206,7 +207,7 @@ void MIDIMapper::refresh_lights()
 
 void MIDIMapper::update_lights_lock_held()
 {
-	map<unsigned, uint8_t> active_lights;  // Desired state.
+	map<MIDIDevice::LightKey, uint8_t> active_lights;  // Desired state.
 	if (current_controller_bank == 0) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kBank1IsSelectedFieldNumber, &active_lights);
 	}
@@ -222,26 +223,41 @@ 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) {
+	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);
 		activate_mapped_light(camera, CameraMIDIMappingProto::kIsCurrentFieldNumber, &active_lights);
 	}
 
+	// Master speed light.
+	if (mapping_proto->has_master_speed_light()) {
+		unsigned controller = mapping_proto->master_speed_light().controller_number();
+		unsigned min = mapping_proto->master_speed_light_min();
+		unsigned max = mapping_proto->master_speed_light_max();
+		int speed_light_value = lrintf((max - min) * current_speed / 2.0f) + min;
+		active_lights[MIDIDevice::LightKey{MIDIDevice::LightKey::CONTROLLER, controller}] = speed_light_value;
+	}
+
 	// 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);
 }