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

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index 36a2e43..9cfb3be 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>
@@ -142,6 +143,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::kNextFieldNumber, MIDIMappingProto::kNextButtonBankFieldNumber,
+		bind(&ControllerReceiver::next, receiver));
 	match_button(note, MIDIMappingProto::kToggleLockFieldNumber, MIDIMappingProto::kToggleLockBankFieldNumber,
 		bind(&ControllerReceiver::toggle_lock, receiver));
 
@@ -206,7 +209,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);
 	}
@@ -235,6 +238,9 @@ void MIDIMapper::update_lights_lock_held()
 	} else if (play_enabled_light == Blinking) {  // Play ready.
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayReadyFieldNumber, &active_lights);
 	}
+	if (next_ready_light == On) {
+		activate_mapped_light(*mapping_proto, MIDIMappingProto::kNextReadyFieldNumber, &active_lights);
+	}
 	if (locked_light == On) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedFieldNumber, &active_lights);
 	} else if (locked_light == Blinking) {
@@ -245,6 +251,15 @@ void MIDIMapper::update_lights_lock_held()
 		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::kCueInEnabledFieldNumber, &active_lights);
 	activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueOutEnabledFieldNumber, &active_lights);