X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=midi_mapping_dialog.cpp;h=4a4ecfbfee7c2218910412df584c0f7fc5cc0af7;hb=327534a3031a332423411c9599c741f2f81657df;hp=9e5d11ba83d162de03d742dba6d2ead661927798;hpb=7c1bb8357495778076a47636c2c4192674034165;p=nageru

diff --git a/midi_mapping_dialog.cpp b/midi_mapping_dialog.cpp
index 9e5d11b..4a4ecfb 100644
--- a/midi_mapping_dialog.cpp
+++ b/midi_mapping_dialog.cpp
@@ -1,18 +1,30 @@
 #include "midi_mapping_dialog.h"
 
-#include "midi_mapper.h"
-#include "midi_mapping.pb.h"
-#include "post_to_main_thread.h"
-#include "ui_midi_mapping.h"
-
+#include <assert.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QSpinBox>
-
+#include <QStringList>
+#include <QTreeWidget>
+#include <stdio.h>
 #include <algorithm>
+#include <cstddef>
+#include <functional>
+#include <limits>
 #include <string>
 
+#include "midi_mapper.h"
+#include "midi_mapping.pb.h"
+#include "post_to_main_thread.h"
+#include "ui_midi_mapping.h"
+
+class QObject;
+
 using namespace google::protobuf;
 using namespace std;
 
@@ -228,7 +240,7 @@ void MIDIMappingDialog::guess_clicked(bool limit_to_group)
 		QSpinBox *source_spinner = spinners[source_bus_idx][field_number].spinner;
 		assert(spinners[source_bus_idx][field_number].group == this_spinner_group);
 
-		if (source_spinner->value() != 0) {
+		if (source_spinner->value() != -1) {
 			spinner->setValue(source_spinner->value() + offset);
 		}
 	}
@@ -318,7 +330,7 @@ unique_ptr<MIDIMappingProto> MIDIMappingDialog::construct_mapping_proto_from_ui(
 	unique_ptr<MIDIMappingProto> mapping_proto(new MIDIMappingProto);
 	for (const InstantiatedSpinner &is : controller_spinners) {
 		const int val = is.spinner->value();
-		if (val == 0) {
+		if (val == -1) {
 			continue;
 		}
 
@@ -328,7 +340,7 @@ unique_ptr<MIDIMappingProto> MIDIMappingDialog::construct_mapping_proto_from_ui(
 	}
 	for (const InstantiatedSpinner &is : button_spinners) {
 		const int val = is.spinner->value();
-		if (val == 0) {
+		if (val == -1) {
 			continue;
 		}
 
@@ -338,7 +350,7 @@ unique_ptr<MIDIMappingProto> MIDIMappingDialog::construct_mapping_proto_from_ui(
 	}
 	for (const InstantiatedSpinner &is : light_spinners) {
 		const int val = is.spinner->value();
-		if (val == 0) {
+		if (val == -1) {
 			continue;
 		}
 
@@ -394,7 +406,7 @@ void MIDIMappingDialog::add_controls(const string &heading,
 
 		for (unsigned bus_idx = 0; bus_idx < num_buses; ++bus_idx) {
 			QSpinBox *spinner = new QSpinBox(this);
-			spinner->setRange(0, 127);
+			spinner->setRange(-1, 127);
 			spinner->setAutoFillBackground(true);
 			spinner->setSpecialValueText("\u200d");  // Zero-width joiner (ie., empty).
 			spinner->installEventFilter(this);  // So we know when the focus changes.
@@ -419,13 +431,13 @@ void MIDIMappingDialog::add_controls(const string &heading,
 void MIDIMappingDialog::fill_controls_from_mapping(const MIDIMappingProto &mapping_proto)
 {
 	for (const InstantiatedSpinner &is : controller_spinners) {
-		is.spinner->setValue(get_controller_mapping(mapping_proto, is.bus_idx, is.field_number, 0));
+		is.spinner->setValue(get_controller_mapping(mapping_proto, is.bus_idx, is.field_number, -1));
 	}
 	for (const InstantiatedSpinner &is : button_spinners) {
-		is.spinner->setValue(get_button_mapping(mapping_proto, is.bus_idx, is.field_number, 0));
+		is.spinner->setValue(get_button_mapping(mapping_proto, is.bus_idx, is.field_number, -1));
 	}
 	for (const InstantiatedSpinner &is : light_spinners) {
-		is.spinner->setValue(get_light_mapping(mapping_proto, is.bus_idx, is.field_number, 0));
+		is.spinner->setValue(get_light_mapping(mapping_proto, is.bus_idx, is.field_number, -1));
 	}
 	for (const InstantiatedComboBox &ic : bank_combo_boxes) {
 		ic.combo_box->setCurrentIndex(get_bank(mapping_proto, ic.field_number, -1) + 1);
@@ -434,28 +446,32 @@ void MIDIMappingDialog::fill_controls_from_mapping(const MIDIMappingProto &mappi
 
 void MIDIMappingDialog::controller_changed(unsigned controller)
 {
-	for (const InstantiatedSpinner &is : controller_spinners) {
-		if (is.spinner->hasFocus()) {
-			is.spinner->setValue(controller);
-			is.spinner->selectAll();
+	post_to_main_thread([=]{
+		for (const InstantiatedSpinner &is : controller_spinners) {
+			if (is.spinner->hasFocus()) {
+				is.spinner->setValue(controller);
+				is.spinner->selectAll();
+			}
 		}
-	}
+	});
 }
 
 void MIDIMappingDialog::note_on(unsigned note)
 {
-	for (const InstantiatedSpinner &is : button_spinners) {
-		if (is.spinner->hasFocus()) {
-			is.spinner->setValue(note);
-			is.spinner->selectAll();
+	post_to_main_thread([=]{
+		for (const InstantiatedSpinner &is : button_spinners) {
+			if (is.spinner->hasFocus()) {
+				is.spinner->setValue(note);
+				is.spinner->selectAll();
+			}
 		}
-	}
-	for (const InstantiatedSpinner &is : light_spinners) {
-		if (is.spinner->hasFocus()) {
-			is.spinner->setValue(note);
-			is.spinner->selectAll();
+		for (const InstantiatedSpinner &is : light_spinners) {
+			if (is.spinner->hasFocus()) {
+				is.spinner->setValue(note);
+				is.spinner->selectAll();
+			}
 		}
-	}
+	});
 }
 
 pair<int, int> MIDIMappingDialog::guess_offset(unsigned bus_idx, MIDIMappingDialog::SpinnerGroup spinner_group)
@@ -493,8 +509,8 @@ pair<int, int> MIDIMappingDialog::guess_offset(unsigned bus_idx, MIDIMappingDial
 		    spinner_group != this_spinner_group) {
 			continue;
 		}
-		if (spinner->value() == 0) {
-			if (source_spinner->value() != 0) {
+		if (spinner->value() == -1) {
+			if (source_spinner->value() != -1) {
 				// If the source value is e.g. 3, offset can't be less than -2 or larger than 124.
 				// Otherwise, we'd extrapolate values outside [1..127].
 				minimum_allowed_offset = max(minimum_allowed_offset, 1 - source_spinner->value());
@@ -502,7 +518,7 @@ pair<int, int> MIDIMappingDialog::guess_offset(unsigned bus_idx, MIDIMappingDial
 			}
 			continue;
 		}
-		if (source_spinner->value() == 0) {
+		if (source_spinner->value() == -1) {
 			// The bus has a controller set that the source bus doesn't set.
 			return not_found;
 		}
@@ -537,7 +553,7 @@ bool MIDIMappingDialog::bus_is_empty(unsigned bus_idx, SpinnerGroup spinner_grou
 		    spinner_group != this_spinner_group) {
 			continue;
 		}
-		if (spinner->value() != 0) {
+		if (spinner->value() != -1) {
 			return false;
 		}
 	}