Unbreak showing the first two channels in the tally JSON.

[nageru] / nageru / midi_mapper.cpp

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index d111a7a650dab499c7102f7e37e75a3663a10ffa..1dccd8e2edc039a6da15ecaa4d87433b6d6c62d2 100644 (file)
--- a/nageru/midi_mapper.cpp
+++ b/nageru/midi_mapper.cpp
@@ -179,6 +179,18 @@ void MIDIMapper::note_on_received(int note)
                bind(&ControllerReceiver::toggle_limiter, receiver));
        match_button(note, MIDIMappingBusProto::kToggleAutoMakeupGainFieldNumber, MIDIMappingProto::kToggleAutoMakeupGainBankFieldNumber,
                bind(&ControllerReceiver::toggle_auto_makeup_gain, receiver));
+       match_button(note, MIDIMappingBusProto::kSwitchVideoChannelFieldNumber, MIDIMappingProto::kSwitchVideoChannelBankFieldNumber,
+               bind(&ControllerReceiver::switch_video_channel, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kApplyTransitionFieldNumber, MIDIMappingProto::kApplyTransitionBankFieldNumber,
+               bind(&ControllerReceiver::apply_transition, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kPrevAudioViewFieldNumber, MIDIMappingProto::kPrevAudioViewBankFieldNumber,
+               bind(&ControllerReceiver::prev_audio_view, receiver));
+       match_button(note, MIDIMappingBusProto::kNextAudioViewFieldNumber, MIDIMappingProto::kNextAudioViewBankFieldNumber,
+               bind(&ControllerReceiver::prev_audio_view, receiver));
+       match_button(note, MIDIMappingBusProto::kBeginNewVideoSegmentFieldNumber, MIDIMappingProto::kBeginNewVideoSegmentBankFieldNumber,
+               bind(&ControllerReceiver::begin_new_segment, receiver));
+       match_button(note, MIDIMappingBusProto::kExitFieldNumber, MIDIMappingProto::kExitBankFieldNumber,
+               bind(&ControllerReceiver::exit, receiver));
 }
 
 void MIDIMapper::update_num_subscribers(unsigned num_subscribers)
@@ -318,7 +330,7 @@ void MIDIMapper::update_lights_lock_held()
                return;
        }
 
-       set<unsigned> active_lights;  // Desired state.
+       map<MIDIDevice::LightKey, uint8_t> active_lights;  // Desired state.
        if (current_controller_bank == 0) {
                activate_lights_all_buses(MIDIMappingBusProto::kBank1IsSelectedFieldNumber, &active_lights);
        }
@@ -363,7 +375,7 @@ void MIDIMapper::update_lights_lock_held()
        midi_device.update_lights(active_lights);
 }
 
-void MIDIMapper::activate_lights_all_buses(int field_number, set<unsigned> *active_lights)
+void MIDIMapper::activate_lights_all_buses(int field_number, map<MIDIDevice::LightKey, uint8_t> *active_lights)
 {
        for (size_t bus_idx = 0; bus_idx < size_t(mapping_proto->bus_mapping_size()); ++bus_idx) {
                const MIDIMappingBusProto &bus_mapping = mapping_proto->bus_mapping(bus_idx);