X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=midi_mapper.cpp;h=42ad1e5e2a00f3e29d43459e77b41ff1b90fbe33;hp=4f0fb48c2da350ad75a5096bea49d003043ba23a;hb=4e3c52ba57c4552a969e71ccdefd9941ce8d6290;hpb=cf7b9ee186d4ef8e5da0531b75854c97b821be44

diff --git a/midi_mapper.cpp b/midi_mapper.cpp
index 4f0fb48..42ad1e5 100644
--- a/midi_mapper.cpp
+++ b/midi_mapper.cpp
@@ -8,6 +8,7 @@
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 #include <google/protobuf/message.h>
 #include <google/protobuf/text_format.h>
+#include <pthread.h>
 #include <poll.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -45,14 +46,16 @@ MIDIMapper::MIDIMapper(ControllerReceiver *receiver)
 {
 	should_quit_fd = eventfd(/*initval=*/0, /*flags=*/0);
 	assert(should_quit_fd != -1);
-	refresh_highlights();
 }
 
 MIDIMapper::~MIDIMapper()
 {
 	should_quit = true;
 	const uint64_t one = 1;
-	write(should_quit_fd, &one, sizeof(one));
+	if (write(should_quit_fd, &one, sizeof(one)) != sizeof(one)) {
+		perror("write(should_quit_fd)");
+		exit(1);
+	}
 	midi_thread.join();
 	close(should_quit_fd);
 }
@@ -146,6 +149,8 @@ ControllerReceiver *MIDIMapper::set_receiver(ControllerReceiver *new_receiver)
 
 void MIDIMapper::thread_func()
 {
+	pthread_setname_np(pthread_self(), "MIDIMapper");
+
 	snd_seq_t *seq;
 	int err;
 
@@ -227,6 +232,10 @@ void MIDIMapper::thread_func()
 			if (err < 0) {
 				if (err == -EINTR) continue;
 				if (err == -EAGAIN) break;
+				if (err == -ENOSPC) {
+					fprintf(stderr, "snd_seq_event_input: Some events were lost.\n");
+					continue;
+				}
 				fprintf(stderr, "snd_seq_event_input: %s\n", snd_strerror(err));
 				return;
 			}
@@ -247,8 +256,6 @@ void MIDIMapper::handle_event(snd_seq_t *seq, snd_seq_event_t *event)
 	lock_guard<mutex> lock(mu);
 	switch (event->type) {
 	case SND_SEQ_EVENT_CONTROLLER: {
-		printf("Controller %d changed to %d\n", event->data.control.param, event->data.control.value);
-
 		const int controller = event->data.control.param;
 		const float value = map_controller_to_float(event->data.control.value);
 
@@ -282,8 +289,6 @@ void MIDIMapper::handle_event(snd_seq_t *seq, snd_seq_event_t *event)
 
 		receiver->note_on(note);
 
-		printf("Note: %d\n", note);
-
 		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);
 			if (bus_mapping.has_prev_bank() &&
@@ -348,6 +353,7 @@ void MIDIMapper::handle_event(snd_seq_t *seq, snd_seq_event_t *event)
 			bind(&ControllerReceiver::toggle_limiter, receiver));
 		match_button(note, MIDIMappingBusProto::kToggleAutoMakeupGainFieldNumber, MIDIMappingProto::kToggleAutoMakeupGainBankFieldNumber,
 			bind(&ControllerReceiver::toggle_auto_makeup_gain, receiver));
+		break;
 	}
 	case SND_SEQ_EVENT_PORT_START:
 		subscribe_to_port_lock_held(seq, event->data.addr);
@@ -384,8 +390,14 @@ void MIDIMapper::handle_event(snd_seq_t *seq, snd_seq_event_t *event)
 
 void MIDIMapper::subscribe_to_port_lock_held(snd_seq_t *seq, const snd_seq_addr_t &addr)
 {
-	// Client 0 is basically the system; ignore it.
-	if (addr.client == 0) {
+	// Client 0 (SNDRV_SEQ_CLIENT_SYSTEM) is basically the system; ignore it.
+	// MIDI through (SNDRV_SEQ_CLIENT_DUMMY) echoes back what we give it, so ignore that, too.
+	if (addr.client == 0 || addr.client == 14) {
+		return;
+	}
+
+	// Don't listen to ourselves.
+	if (addr.client == snd_seq_client_id(seq)) {
 		return;
 	}