Move controller_spin_box.h to shared, so that the upcoming Futatabi MIDI editor can...

[nageru] / nageru / midi_mapper.cpp

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index 7457fbb53f99082a292c5c8699e6fd01e28fd103..d0a42ec60274e05c00d98ad528162ad3519c5b94 100644 (file)
--- 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);
 
@@ -333,7 +318,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 +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);