X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.cpp;h=061dd2d8c7c3371875b623438a5ce66a26d8ab27;hb=1572c05240f8bc82683a31b6c2df979101b12474;hp=a76e36cb04f83c96ed5c49149078115c23a2cd13;hpb=a6f3a2275ad116e6ab338e583ab8ef1b1141b468;p=nageru

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index a76e36c..061dd2d 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"
@@ -78,11 +79,16 @@ ControllerReceiver *MIDIMapper::set_receiver(ControllerReceiver *new_receiver)
 void MIDIMapper::controller_received(int controller, int value_int)
 {
 	int delta_value = value_int - 64;  // For infinite controllers such as jog.
+	float value = map_controller_to_float(controller, value_int);
 
 	receiver->controller_changed(controller);
 
 	match_controller(controller, MIDIMappingProto::kJogFieldNumber, MIDIMappingProto::kJogBankFieldNumber,
 		delta_value, bind(&ControllerReceiver::jog, receiver, _1));
+
+	// Speed goes from 0.0 to 2.0 (the receiver will clamp).
+	match_controller(controller, MIDIMappingProto::kMasterSpeedFieldNumber, MIDIMappingProto::kMasterSpeedBankFieldNumber,
+		value * 2.0, bind(&ControllerReceiver::set_master_speed, receiver, _1));
 }
 
 void MIDIMapper::note_on_received(int note)
@@ -136,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) {
@@ -198,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);
 	}
@@ -223,6 +231,11 @@ void MIDIMapper::update_lights_lock_held()
 	if (play_enabled_light) {
 		activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayEnabledFieldNumber, &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);
 		activate_mapped_light(camera, CameraMIDIMappingProto::kIsCurrentFieldNumber, &active_lights);