X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmidi_mapper.cpp;h=1dccd8e2edc039a6da15ecaa4d87433b6d6c62d2;hb=575f6eb1b052bb1291987753b1a8cccc7f1e3ab3;hp=7457fbb53f99082a292c5c8699e6fd01e28fd103;hpb=c7627f3f46ca3ec755e301dde2fca2f6e244f64d;p=nageru

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index 7457fbb..1dccd8e 100644
--- a/nageru/midi_mapper.cpp
+++ b/nageru/midi_mapper.cpp
@@ -19,7 +19,8 @@
 #include <thread>
 
 #include "audio_mixer.h"
-#include "midi_mapping.pb.h"
+#include "nageru_midi_mapping.pb.h"
+#include "shared/midi_device.h"
 #include "shared/midi_mapper_util.h"
 #include "shared/text_proto.h"
 
@@ -27,22 +28,6 @@ using namespace google::protobuf;
 using namespace std;
 using namespace std::placeholders;
 
-namespace {
-
-double map_controller_to_float(int val)
-{
-	// Slightly hackish mapping so that we can represent exactly 0.0, 0.5 and 1.0.
-	if (val <= 0) {
-		return 0.0;
-	} else if (val >= 127) {
-		return 1.0;
-	} else {
-		return (val + 0.5) / 127.0;
-	}
-}
-
-}  // namespace
-
 MIDIMapper::MIDIMapper(ControllerReceiver *receiver)
 	: receiver(receiver), mapping_proto(new MIDIMappingProto), midi_device(this)
 {
@@ -96,7 +81,7 @@ ControllerReceiver *MIDIMapper::set_receiver(ControllerReceiver *new_receiver)
 
 void MIDIMapper::controller_received(int controller, int value_int)
 {
-	const float value = map_controller_to_float(value_int);
+	const float value = map_controller_to_float(controller, value_int);
 
 	receiver->controller_changed(controller);
 
@@ -194,6 +179,18 @@ void MIDIMapper::note_on_received(int note)
 		bind(&ControllerReceiver::toggle_limiter, receiver));
 	match_button(note, MIDIMappingBusProto::kToggleAutoMakeupGainFieldNumber, MIDIMappingProto::kToggleAutoMakeupGainBankFieldNumber,
 		bind(&ControllerReceiver::toggle_auto_makeup_gain, receiver));
+	match_button(note, MIDIMappingBusProto::kSwitchVideoChannelFieldNumber, MIDIMappingProto::kSwitchVideoChannelBankFieldNumber,
+		bind(&ControllerReceiver::switch_video_channel, receiver, _1));
+	match_button(note, MIDIMappingBusProto::kApplyTransitionFieldNumber, MIDIMappingProto::kApplyTransitionBankFieldNumber,
+		bind(&ControllerReceiver::apply_transition, receiver, _1));
+	match_button(note, MIDIMappingBusProto::kPrevAudioViewFieldNumber, MIDIMappingProto::kPrevAudioViewBankFieldNumber,
+		bind(&ControllerReceiver::prev_audio_view, receiver));
+	match_button(note, MIDIMappingBusProto::kNextAudioViewFieldNumber, MIDIMappingProto::kNextAudioViewBankFieldNumber,
+		bind(&ControllerReceiver::prev_audio_view, receiver));
+	match_button(note, MIDIMappingBusProto::kBeginNewVideoSegmentFieldNumber, MIDIMappingProto::kBeginNewVideoSegmentBankFieldNumber,
+		bind(&ControllerReceiver::begin_new_segment, receiver));
+	match_button(note, MIDIMappingBusProto::kExitFieldNumber, MIDIMappingProto::kExitBankFieldNumber,
+		bind(&ControllerReceiver::exit, receiver));
 }
 
 void MIDIMapper::update_num_subscribers(unsigned num_subscribers)
@@ -333,7 +330,7 @@ void MIDIMapper::update_lights_lock_held()
 		return;
 	}
 
-	set<unsigned> active_lights;  // Desired state.
+	map<MIDIDevice::LightKey, uint8_t> active_lights;  // Desired state.
 	if (current_controller_bank == 0) {
 		activate_lights_all_buses(MIDIMappingBusProto::kBank1IsSelectedFieldNumber, &active_lights);
 	}
@@ -378,7 +375,7 @@ void MIDIMapper::update_lights_lock_held()
 	midi_device.update_lights(active_lights);
 }
 
-void MIDIMapper::activate_lights_all_buses(int field_number, set<unsigned> *active_lights)
+void MIDIMapper::activate_lights_all_buses(int field_number, map<MIDIDevice::LightKey, uint8_t> *active_lights)
 {
 	for (size_t bus_idx = 0; bus_idx < size_t(mapping_proto->bus_mapping_size()); ++bus_idx) {
 		const MIDIMappingBusProto &bus_mapping = mapping_proto->bus_mapping(bus_idx);