Use ALSA timestamps for marking input data.

[nageru] / nageru / midi_mapper.cpp

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index 30e934b856396f3e450274912c835dfe52f1436c..d0a42ec60274e05c00d98ad528162ad3519c5b94 100644 (file)
--- a/nageru/midi_mapper.cpp
+++ b/nageru/midi_mapper.cpp
@@ -19,29 +19,15 @@
 #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"
 
 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)
 {
@@ -95,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);
 
@@ -209,15 +195,7 @@ void MIDIMapper::match_controller(int controller, int field_number, int bank_fie
 
        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);
-
-               const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number);
-               const Reflection *bus_reflection = bus_mapping.GetReflection();
-               if (!bus_reflection->HasField(bus_mapping, descriptor)) {
-                       continue;
-               }
-               const MIDIControllerProto &controller_proto =
-                       static_cast<const MIDIControllerProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-               if (controller_proto.controller_number() == controller) {
+               if (match_controller_helper(bus_mapping, field_number, controller)) {
                        func(bus_idx, value);
                }
        }
@@ -231,15 +209,7 @@ void MIDIMapper::match_button(int note, int field_number, int bank_field_number,
 
        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);
-
-               const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number);
-               const Reflection *bus_reflection = bus_mapping.GetReflection();
-               if (!bus_reflection->HasField(bus_mapping, descriptor)) {
-                       continue;
-               }
-               const MIDIButtonProto &button_proto =
-                       static_cast<const MIDIButtonProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-               if (button_proto.note_number() == note) {
+               if (match_button_helper(bus_mapping, field_number, note)) {
                        func(bus_idx);
                }
        }
@@ -259,10 +229,7 @@ bool MIDIMapper::has_active_controller(unsigned bus_idx, int field_number, int b
 
 bool MIDIMapper::bank_mismatch(int bank_field_number)
 {
-       const FieldDescriptor *bank_descriptor = mapping_proto->GetDescriptor()->FindFieldByNumber(bank_field_number);
-       const Reflection *reflection = mapping_proto->GetReflection();
-       return (reflection->HasField(*mapping_proto, bank_descriptor) &&
-               reflection->GetInt32(*mapping_proto, bank_descriptor) != current_controller_bank);
+       return !match_bank_helper(*mapping_proto, bank_field_number, current_controller_bank);
 }
 
 void MIDIMapper::refresh_highlights()
@@ -345,26 +312,13 @@ void MIDIMapper::update_highlights()
        }
 }
 
-// Find what MIDI note the given light (as given by field_number) is mapped to, and enable it.
-void activate_mapped_light(const MIDIMappingBusProto &bus_mapping, int field_number, set<unsigned> *active_lights)
-{
-       const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number);
-       const Reflection *bus_reflection = bus_mapping.GetReflection();
-       if (!bus_reflection->HasField(bus_mapping, descriptor)) {
-               return;
-       }
-       const MIDILightProto &light_proto =
-               static_cast<const MIDILightProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-       active_lights->insert(light_proto.note_number());
-}
-
 void MIDIMapper::update_lights_lock_held()
 {
        if (global_audio_mixer == nullptr) {
                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);
        }
@@ -409,7 +363,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);