Support changing overall playing speed at runtime, using a slider or a MIDI controller.

[nageru] / nageru / midi_mapper.cpp

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index 7457fbb53f99082a292c5c8699e6fd01e28fd103..d111a7a650dab499c7102f7e37e75a3663a10ffa 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);