From: Steinar H. Gunderson Date: Sat, 19 Jan 2019 12:58:24 +0000 (+0100) Subject: Make the master light speed maximum inclusive instead of exclusive X-Git-Tag: 1.8.2~4 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=9921f1fe12f5a7dadab7e84069fa8591d5c5663d Make the master light speed maximum inclusive instead of exclusive Less confusing when in an UI, and also doesn't require us to have some spinners at max 127 and some at max 128 (save for pitch bend). --- diff --git a/futatabi/behringer_cmd_pl1.midimapping b/futatabi/behringer_cmd_pl1.midimapping index edd5a05..52777b9 100644 --- a/futatabi/behringer_cmd_pl1.midimapping +++ b/futatabi/behringer_cmd_pl1.midimapping @@ -43,7 +43,7 @@ preview_ready: { note_number: 27 velocity: 2 } master_speed: { controller_number: 128 } master_speed_light: { controller_number: 10 } master_speed_light_min: 1 -master_speed_light_max: 16 +master_speed_light_max: 15 # Master speed lock is mapped to lock. toggle_lock: { note_number: 25 } diff --git a/futatabi/futatabi_midi_mapping.proto b/futatabi/futatabi_midi_mapping.proto index 9714d2d..8e6b3e9 100644 --- a/futatabi/futatabi_midi_mapping.proto +++ b/futatabi/futatabi_midi_mapping.proto @@ -33,7 +33,7 @@ message MIDIMappingProto { optional int32 master_speed_bank = 35; optional MIDIControllerProto master_speed_light = 42; // NOTE: Controller, not light. optional int32 master_speed_light_min = 43; - optional int32 master_speed_light_max = 44 [default=128]; // Exclusive. + optional int32 master_speed_light_max = 44 [default=127]; // Inclusive. // Buttons. optional MIDIButtonProto preview = 18; diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp index c675820..1d5d79e 100644 --- a/futatabi/midi_mapper.cpp +++ b/futatabi/midi_mapper.cpp @@ -251,7 +251,7 @@ void MIDIMapper::update_lights_lock_held() unsigned controller = mapping_proto->master_speed_light().controller_number(); unsigned min = mapping_proto->master_speed_light_min(); unsigned max = mapping_proto->master_speed_light_max(); - int speed_light_value = lrintf((max - min - 1) * current_speed / 2.0f) + min; + int speed_light_value = lrintf((max - min) * current_speed / 2.0f) + min; active_lights[MIDIDevice::LightKey{MIDIDevice::LightKey::CONTROLLER, controller}] = speed_light_value; }