IWYU-fix nageru/*.cpp.

[nageru] / nageru / midi_mapper.cpp

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index 1fdb72e6c4006a86910588ba37c47fb0a548b3c1..2fd6dbb9ab04c11e72fb9c8efb1f97125c128f74 100644 (file)
--- a/nageru/midi_mapper.cpp
+++ b/nageru/midi_mapper.cpp
@@ -1,22 +1,16 @@
 #include "midi_mapper.h"
 
-#include <alsa/asoundlib.h>
 #include <assert.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <google/protobuf/descriptor.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/message.h>
-#include <google/protobuf/text_format.h>
-#include <pthread.h>
+#include <map>
+#include <mutex>
 #include <poll.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <sys/eventfd.h>
-#include <unistd.h>
+#include <string>
 #include <algorithm>
 #include <functional>
-#include <thread>
 
 #include "audio_mixer.h"
 #include "nageru_midi_mapping.pb.h"
@@ -179,6 +173,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 +324,7 @@ void MIDIMapper::update_lights_lock_held()
                return;
        }
 
-       map<unsigned, uint8_t> 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 +369,7 @@ void MIDIMapper::update_lights_lock_held()
        midi_device.update_lights(active_lights);
 }
 
-void MIDIMapper::activate_lights_all_buses(int field_number, map<unsigned, uint8_t> *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);