X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmidi_mapping_dialog.cpp;h=d27a0c2315e18c56f0c6005d0ef3d078d291fbf2;hb=94bbe01b1a608fa49622728cd65681d50ca72b69;hp=7eec6d285d123c43f82b3233a471ee845f872590;hpb=beead04c23b42c815f448cd0126d87f9627bbfde;p=nageru

diff --git a/nageru/midi_mapping_dialog.cpp b/nageru/midi_mapping_dialog.cpp
index 7eec6d2..d27a0c2 100644
--- a/nageru/midi_mapping_dialog.cpp
+++ b/nageru/midi_mapping_dialog.cpp
@@ -18,9 +18,10 @@
 #include <limits>
 #include <string>
 
-#include "controller_spin_box.h"
+#include "shared/controller_spin_box.h"
 #include "midi_mapper.h"
 #include "nageru_midi_mapping.pb.h"
+#include "shared/midi_mapper_util.h"
 #include "shared/post_to_main_thread.h"
 #include "ui_midi_mapping.h"
 
@@ -104,16 +105,8 @@ int get_controller_mapping(const MIDIMappingProto &mapping_proto, size_t bus_idx
 	if (bus_idx >= size_t(mapping_proto.bus_mapping_size())) {
 		return default_value;
 	}
-
 	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 default_value;
-	}
-	const MIDIControllerProto &controller_proto =
-		static_cast<const MIDIControllerProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-	return controller_proto.controller_number();
+	return get_controller_mapping_helper(bus_mapping, field_number, default_value);
 }
 
 int get_button_mapping(const MIDIMappingProto &mapping_proto, size_t bus_idx, int field_number, int default_value)
@@ -123,14 +116,7 @@ int get_button_mapping(const MIDIMappingProto &mapping_proto, size_t bus_idx, in
 	}
 
 	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 default_value;
-	}
-	const MIDIButtonProto &bus_proto =
-		static_cast<const MIDIButtonProto &>(bus_reflection->GetMessage(bus_mapping, descriptor));
-	return bus_proto.note_number();
+	return get_button_mapping_helper(bus_mapping, field_number, default_value);
 }
 
 int get_light_mapping(const MIDIMappingProto &mapping_proto, size_t bus_idx, int field_number, int default_value)
@@ -543,6 +529,10 @@ pair<int, int> MIDIMappingDialog::guess_offset(unsigned bus_idx, MIDIMappingDial
 			// The bus has a controller set that the source bus doesn't set.
 			return not_found;
 		}
+		if (source_spinner->value() == MIDIReceiver::PITCH_BEND_CONTROLLER) {
+			// It's impossible to interpolate across the pitch bend.
+			return not_found;
+		}
 
 		int candidate_offset = spinner->value() - source_spinner->value();
 		if (!found_offset) {