X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.cpp;h=63b21e44fa7c6fb53c089caa89d4a42686a51cd4;hb=fcae09355c1a00a68015b3d727339aebd2e52aa4;hp=849c72c7e1f4dd399096fc7b372d13283c37ebcf;hpb=873c8b204ab70622f6e231556cc94d3aab1889ce;p=nageru diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp index 849c72c..63b21e4 100644 --- a/futatabi/midi_mapper.cpp +++ b/futatabi/midi_mapper.cpp @@ -228,11 +228,15 @@ void MIDIMapper::update_lights_lock_held() if (queue_enabled_light) { activate_mapped_light(*mapping_proto, MIDIMappingProto::kQueueEnabledFieldNumber, &active_lights); } - if (play_enabled_light) { - activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayEnabledFieldNumber, &active_lights); + if (play_enabled_light == On) { // Playing. + activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayingFieldNumber, &active_lights); + } else if (play_enabled_light == Blinking) { // Play ready. + activate_mapped_light(*mapping_proto, MIDIMappingProto::kPlayReadyFieldNumber, &active_lights); } - if (locked_light) { + if (locked_light == On) { activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedFieldNumber, &active_lights); + } else if (locked_light == Blinking) { + activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedBlinkingFieldNumber, &active_lights); } if (current_highlighted_camera >= 0 && current_highlighted_camera < mapping_proto->camera_size()) { const CameraMIDIMappingProto &camera = mapping_proto->camera(current_highlighted_camera);