X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmidi_mapper.cpp;h=2fd6dbb9ab04c11e72fb9c8efb1f97125c128f74;hb=HEAD;hp=7b67fd1d524a71d98c7efc2ec94d898fb22ec306;hpb=36eca4f9642b540e5c7fdf59861dcdb7a8b622e6;p=nageru diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp index 7b67fd1..e7b9068 100644 --- a/nageru/midi_mapper.cpp +++ b/nageru/midi_mapper.cpp @@ -1,47 +1,27 @@ #include "midi_mapper.h" -#include #include -#include -#include #include -#include #include -#include -#include +#include +#include #include #include #include -#include -#include +#include #include #include -#include #include "audio_mixer.h" -#include "midi_mapping.pb.h" +#include "nageru_midi_mapping.pb.h" +#include "shared/midi_device.h" +#include "shared/midi_mapper_util.h" #include "shared/text_proto.h" using namespace google::protobuf; using namespace std; using namespace std::placeholders; -namespace { - -double map_controller_to_float(int val) -{ - // Slightly hackish mapping so that we can represent exactly 0.0, 0.5 and 1.0. - if (val <= 0) { - return 0.0; - } else if (val >= 127) { - return 1.0; - } else { - return (val + 0.5) / 127.0; - } -} - -} // namespace - MIDIMapper::MIDIMapper(ControllerReceiver *receiver) : receiver(receiver), mapping_proto(new MIDIMappingProto), midi_device(this) { @@ -69,7 +49,7 @@ void MIDIMapper::set_midi_mapping(const MIDIMappingProto &new_mapping) } num_controller_banks = min(max(mapping_proto->num_controller_banks(), 1), 5); - current_controller_bank = 0; + current_controller_bank = 0; receiver->clear_all_highlights(); update_highlights(); @@ -95,7 +75,7 @@ ControllerReceiver *MIDIMapper::set_receiver(ControllerReceiver *new_receiver) void MIDIMapper::controller_received(int controller, int value_int) { - const float value = map_controller_to_float(value_int); + const float value = map_controller_to_float(controller, value_int); receiver->controller_changed(controller); @@ -193,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) @@ -209,15 +201,7 @@ void MIDIMapper::match_controller(int controller, int field_number, int bank_fie 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); - - const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number); - const Reflection *bus_reflection = bus_mapping.GetReflection(); - if (!bus_reflection->HasField(bus_mapping, descriptor)) { - continue; - } - const MIDIControllerProto &controller_proto = - static_cast(bus_reflection->GetMessage(bus_mapping, descriptor)); - if (controller_proto.controller_number() == controller) { + if (match_controller_helper(bus_mapping, field_number, controller)) { func(bus_idx, value); } } @@ -231,15 +215,7 @@ void MIDIMapper::match_button(int note, int field_number, int bank_field_number, 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); - - const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number); - const Reflection *bus_reflection = bus_mapping.GetReflection(); - if (!bus_reflection->HasField(bus_mapping, descriptor)) { - continue; - } - const MIDIButtonProto &button_proto = - static_cast(bus_reflection->GetMessage(bus_mapping, descriptor)); - if (button_proto.note_number() == note) { + if (match_button_helper(bus_mapping, field_number, note)) { func(bus_idx); } } @@ -259,10 +235,7 @@ bool MIDIMapper::has_active_controller(unsigned bus_idx, int field_number, int b bool MIDIMapper::bank_mismatch(int bank_field_number) { - const FieldDescriptor *bank_descriptor = mapping_proto->GetDescriptor()->FindFieldByNumber(bank_field_number); - const Reflection *reflection = mapping_proto->GetReflection(); - return (reflection->HasField(*mapping_proto, bank_descriptor) && - reflection->GetInt32(*mapping_proto, bank_descriptor) != current_controller_bank); + return !match_bank_helper(*mapping_proto, bank_field_number, current_controller_bank); } void MIDIMapper::refresh_highlights() @@ -351,7 +324,7 @@ void MIDIMapper::update_lights_lock_held() return; } - set active_lights; // Desired state. + map active_lights; // Desired state. if (current_controller_bank == 0) { activate_lights_all_buses(MIDIMappingBusProto::kBank1IsSelectedFieldNumber, &active_lights); } @@ -375,52 +348,31 @@ void MIDIMapper::update_lights_lock_held() } unsigned num_buses = min(global_audio_mixer->num_buses(), mapping_proto->bus_mapping_size()); for (unsigned bus_idx = 0; bus_idx < num_buses; ++bus_idx) { + const MIDIMappingBusProto &bus_mapping = mapping_proto->bus_mapping(bus_idx); if (global_audio_mixer->get_mute(bus_idx)) { - activate_lights(bus_idx, MIDIMappingBusProto::kIsMutedFieldNumber, &active_lights); + activate_mapped_light(bus_mapping, MIDIMappingBusProto::kIsMutedFieldNumber, &active_lights); } if (global_audio_mixer->get_locut_enabled(bus_idx)) { - activate_lights(bus_idx, MIDIMappingBusProto::kLocutIsOnFieldNumber, &active_lights); + activate_mapped_light(bus_mapping, MIDIMappingBusProto::kLocutIsOnFieldNumber, &active_lights); } if (global_audio_mixer->get_gain_staging_auto(bus_idx)) { - activate_lights(bus_idx, MIDIMappingBusProto::kAutoGainStagingIsOnFieldNumber, &active_lights); + activate_mapped_light(bus_mapping, MIDIMappingBusProto::kAutoGainStagingIsOnFieldNumber, &active_lights); } if (global_audio_mixer->get_compressor_enabled(bus_idx)) { - activate_lights(bus_idx, MIDIMappingBusProto::kCompressorIsOnFieldNumber, &active_lights); + activate_mapped_light(bus_mapping, MIDIMappingBusProto::kCompressorIsOnFieldNumber, &active_lights); } if (has_peaked[bus_idx]) { - activate_lights(bus_idx, MIDIMappingBusProto::kHasPeakedFieldNumber, &active_lights); + activate_mapped_light(bus_mapping, MIDIMappingBusProto::kHasPeakedFieldNumber, &active_lights); } } midi_device.update_lights(active_lights); } -void MIDIMapper::activate_lights(unsigned bus_idx, int field_number, set *active_lights) -{ - const MIDIMappingBusProto &bus_mapping = mapping_proto->bus_mapping(bus_idx); - - const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number); - const Reflection *bus_reflection = bus_mapping.GetReflection(); - if (!bus_reflection->HasField(bus_mapping, descriptor)) { - return; - } - const MIDILightProto &light_proto = - static_cast(bus_reflection->GetMessage(bus_mapping, descriptor)); - active_lights->insert(light_proto.note_number()); -} - -void MIDIMapper::activate_lights_all_buses(int field_number, set *active_lights) +void MIDIMapper::activate_lights_all_buses(int field_number, map *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); - - const FieldDescriptor *descriptor = bus_mapping.GetDescriptor()->FindFieldByNumber(field_number); - const Reflection *bus_reflection = bus_mapping.GetReflection(); - if (!bus_reflection->HasField(bus_mapping, descriptor)) { - continue; - } - const MIDILightProto &light_proto = - static_cast(bus_reflection->GetMessage(bus_mapping, descriptor)); - active_lights->insert(light_proto.note_number()); + activate_mapped_light(bus_mapping, field_number, active_lights); } }