Move another helper into midi_mapper_util.h.

[nageru] / nageru / midi_mapper.cpp

diff --git a/nageru/midi_mapper.cpp b/nageru/midi_mapper.cpp
index c6d2e9c5f6c6ac8315311e35d5e7412e779d4f9b..7457fbb53f99082a292c5c8699e6fd01e28fd103 100644 (file)
--- a/nageru/midi_mapper.cpp
+++ b/nageru/midi_mapper.cpp
@@ -20,6 +20,8 @@
 
 #include "audio_mixer.h"
 #include "midi_mapping.pb.h"
+#include "shared/midi_mapper_util.h"
+#include "shared/text_proto.h"
 
 using namespace google::protobuf;
 using namespace std;
@@ -50,39 +52,12 @@ MIDIMapper::~MIDIMapper() {}
 
 bool load_midi_mapping_from_file(const string &filename, MIDIMappingProto *new_mapping)
 {
-       // Read and parse the protobuf from disk.
-       int fd = open(filename.c_str(), O_RDONLY);
-       if (fd == -1) {
-               perror(filename.c_str());
-               return false;
-       }
-       io::FileInputStream input(fd);  // Takes ownership of fd.
-       if (!TextFormat::Parse(&input, new_mapping)) {
-               input.Close();
-               return false;
-       }
-       input.Close();
-       return true;
+       return load_proto_from_file(filename, new_mapping);
 }
 
 bool save_midi_mapping_to_file(const MIDIMappingProto &mapping_proto, const string &filename)
 {
-       // Save to disk. We use the text format because it's friendlier
-       // for a user to look at and edit.
-       int fd = open(filename.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0666);
-       if (fd == -1) {
-               perror(filename.c_str());
-               return false;
-       }
-       io::FileOutputStream output(fd);  // Takes ownership of fd.
-       if (!TextFormat::Print(mapping_proto, &output)) {
-               // TODO: Don't overwrite the old file (if any) on error.
-               output.Close();
-               return false;
-       }
-
-       output.Close();
-       return true;
+       return save_proto_to_file(mapping_proto, filename);
 }
 
 void MIDIMapper::set_midi_mapping(const MIDIMappingProto &new_mapping)
@@ -235,15 +210,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<const MIDIControllerProto &>(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);
                }
        }
@@ -257,15 +224,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<const MIDIButtonProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-               if (button_proto.note_number() == note) {
+               if (match_button_helper(bus_mapping, field_number, note)) {
                        func(bus_idx);
                }
        }
@@ -285,10 +244,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()
@@ -401,52 +357,31 @@ void MIDIMapper::update_lights_lock_held()
        }
        unsigned num_buses = min<unsigned>(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<unsigned> *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<const MIDILightProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-       active_lights->insert(light_proto.note_number());
-}
-
 void MIDIMapper::activate_lights_all_buses(int field_number, set<unsigned> *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<const MIDILightProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-               active_lights->insert(light_proto.note_number());
+               activate_mapped_light(bus_mapping, field_number, active_lights);
        }
 }