Add infrastructure for MIDI lights that are controllers instead of notes.

[nageru] / shared / midi_mapper_util.h

diff --git a/shared/midi_mapper_util.h b/shared/midi_mapper_util.h
index 39ccd84e43f7d1ec1e707e2de730ea1d08ad59d9..9120fc8719998f97575193e4e739c25aa7f65f58 100644 (file)
--- a/shared/midi_mapper_util.h
+++ b/shared/midi_mapper_util.h
@@ -2,6 +2,7 @@
 #define _MIDI_MAPPER_UTIL_H 1
 
 #include "midi_mapping.pb.h"
+#include "shared/midi_device.h"
 
 #include <google/protobuf/descriptor.h>
 
@@ -48,7 +49,7 @@ inline bool match_bank_helper(const Proto &msg, int bank_field_number, int bank)
 
 // Find what MIDI note the given light (as given by field_number) is mapped to, and enable it.
 template <class Proto>
-void activate_mapped_light(const Proto &msg, int field_number, std::set<unsigned> *active_lights)
+void activate_mapped_light(const Proto &msg, int field_number, std::map<MIDIDevice::LightKey, uint8_t> *active_lights)
 {
        using namespace google::protobuf;
        const FieldDescriptor *descriptor = msg.GetDescriptor()->FindFieldByNumber(field_number);
@@ -58,7 +59,35 @@ void activate_mapped_light(const Proto &msg, int field_number, std::set<unsigned
        }
        const MIDILightProto &light_proto =
                static_cast<const MIDILightProto &>(reflection->GetMessage(msg, descriptor));
-       active_lights->insert(light_proto.note_number());
+       active_lights->emplace(MIDIDevice::LightKey{MIDIDevice::LightKey::NOTE, unsigned(light_proto.note_number())},
+               light_proto.velocity());
+}
+
+inline double map_controller_to_float(int controller, int val)
+{
+       if (controller == MIDIReceiver::PITCH_BEND_CONTROLLER) {
+               // We supposedly go from -8192 to 8191 (inclusive), but there are
+               // controllers that only have 10-bit precision and do the upconversion
+               // to 14-bit wrong (just padding with zeros), making 8176 the highest
+               // attainable value. We solve this by making the effective range
+               // -8176..8176 (inclusive).
+               if (val <= -8176) {
+                       return 0.0;
+               } else if (val >= 8176) {
+                       return 1.0;
+               } else {
+                       return 0.5 * (double(val) / 8176.0) + 0.5;
+               }
+       }
+
+       // 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;
+       }
 }
 
 #endif  // !defined(_MIDI_MAPPER_UTIL_H)