X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.cpp;h=36a2e43f9224232570cc2f02d4e9b8168e5e4943;hb=686a02a3ffed47c099c1d91d95d0d90e222d297d;hp=061dd2d8c7c3371875b623438a5ce66a26d8ab27;hpb=b7a32af3a037f9fa70cf54f992314f68279c1204;p=nageru diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp index 061dd2d..36a2e43 100644 --- a/futatabi/midi_mapper.cpp +++ b/futatabi/midi_mapper.cpp @@ -222,14 +222,18 @@ void MIDIMapper::update_lights_lock_held() if (current_controller_bank == 4) { activate_mapped_light(*mapping_proto, MIDIMappingProto::kBank5IsSelectedFieldNumber, &active_lights); } - if (preview_enabled_light) { - activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewEnabledFieldNumber, &active_lights); + if (preview_enabled_light == On) { // Playing. + activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewPlayingFieldNumber, &active_lights); + } else if (preview_enabled_light == Blinking) { // Preview ready. + activate_mapped_light(*mapping_proto, MIDIMappingProto::kPreviewReadyFieldNumber, &active_lights); } 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 == On) { activate_mapped_light(*mapping_proto, MIDIMappingProto::kLockedFieldNumber, &active_lights); @@ -242,8 +246,8 @@ void MIDIMapper::update_lights_lock_held() } // These are always enabled right now. - activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueInFieldNumber, &active_lights); - activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueOutFieldNumber, &active_lights); + activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueInEnabledFieldNumber, &active_lights); + activate_mapped_light(*mapping_proto, MIDIMappingProto::kCueOutEnabledFieldNumber, &active_lights); midi_device.update_lights(active_lights); }