X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmidi_mapper.cpp;fp=nageru%2Fmidi_mapper.cpp;h=d111a7a650dab499c7102f7e37e75a3663a10ffa;hb=2c9a83aeae44dae6a0bbfbae33719976e6d527af;hp=fe62546569c4defca910c6a06f917244bcaf7b37;hpb=8e88294902b4b6f43c8db83dbf04830b5b9d2bfd;p=nageru diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp index fe62546..d111a7a 100644 --- a/nageru/midi_mapper.cpp +++ b/nageru/midi_mapper.cpp @@ -28,37 +28,6 @@ using namespace google::protobuf; using namespace std; using namespace std::placeholders; -namespace { - -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; - } -} - -} // namespace - MIDIMapper::MIDIMapper(ControllerReceiver *receiver) : receiver(receiver), mapping_proto(new MIDIMappingProto), midi_device(this) {