Add infrastructure for MIDI lights that are controllers instead of notes.

[nageru] / futatabi / midi_mapper.cpp

diff --git a/futatabi/midi_mapper.cpp b/futatabi/midi_mapper.cpp
index 061dd2d8c7c3371875b623438a5ce66a26d8ab27..93e367a77aa1ad0987c1a0f40e38372f90c0f14f 100644 (file)
--- a/futatabi/midi_mapper.cpp
+++ b/futatabi/midi_mapper.cpp
@@ -206,7 +206,7 @@ void MIDIMapper::refresh_lights()
 
 void MIDIMapper::update_lights_lock_held()
 {
-       map<unsigned, uint8_t> active_lights;  // Desired state.
+       map<MIDIDevice::LightKey, uint8_t> active_lights;  // Desired state.
        if (current_controller_bank == 0) {
                activate_mapped_light(*mapping_proto, MIDIMappingProto::kBank1IsSelectedFieldNumber, &active_lights);
        }
@@ -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);
 }