]> git.sesse.net Git - nageru/commitdiff
Split out the ALSA-specific parts from MIDIMapper into a new class MIDIDevice.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 5 Jan 2019 19:38:36 +0000 (20:38 +0100)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Sat, 5 Jan 2019 19:41:13 +0000 (20:41 +0100)
meson.build
nageru/midi_device.cpp [new file with mode: 0644]
nageru/midi_device.h [new file with mode: 0644]
nageru/midi_mapper.cpp
nageru/midi_mapper.h

index 461c12559dc58dcfeb942203eda8b90d0d45319d..a3e943004d5b367ebfd679f0c30efe321df3001e 100644 (file)
@@ -177,7 +177,7 @@ qt_files = qt5.preprocess(
 # Qt objects.
 nageru_srcs += ['nageru/glwidget.cpp', 'nageru/mainwindow.cpp', 'nageru/vumeter.cpp', 'nageru/lrameter.cpp', 'nageru/compression_reduction_meter.cpp',
        'nageru/correlation_meter.cpp', 'nageru/analyzer.cpp', 'nageru/input_mapping_dialog.cpp', 'nageru/midi_mapping_dialog.cpp',
-       'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp']
+       'nageru/nonlinear_fader.cpp', 'nageru/context_menus.cpp', 'nageru/vu_common.cpp', 'nageru/piecewise_interpolator.cpp', 'nageru/midi_mapper.cpp', 'nageru/midi_device.cpp']
 
 # Auxiliary objects used for nearly everything.
 aux_srcs = ['nageru/flags.cpp']
diff --git a/nageru/midi_device.cpp b/nageru/midi_device.cpp
new file mode 100644 (file)
index 0000000..822beae
--- /dev/null
@@ -0,0 +1,273 @@
+#include "midi_device.h"
+
+#include <alsa/asoundlib.h>
+#include <sys/eventfd.h>
+#include <unistd.h>
+#include <thread>
+#include <utility>
+
+using namespace std;
+
+MIDIDevice::MIDIDevice(MIDIReceiver *receiver)
+       : receiver(receiver)
+{
+       should_quit_fd = eventfd(/*initval=*/0, /*flags=*/0);
+       assert(should_quit_fd != -1);
+}
+
+MIDIDevice::~MIDIDevice()
+{
+       should_quit = true;
+       const uint64_t one = 1;
+       if (write(should_quit_fd, &one, sizeof(one)) != sizeof(one)) {
+               perror("write(should_quit_fd)");
+               exit(1);
+       }
+       midi_thread.join();
+       close(should_quit_fd);
+}
+
+void MIDIDevice::start_thread()
+{
+       midi_thread = thread(&MIDIDevice::thread_func, this);
+}
+
+#define RETURN_ON_ERROR(msg, expr) do {                            \
+       int err = (expr);                                          \
+       if (err < 0) {                                             \
+               fprintf(stderr, msg ": %s\n", snd_strerror(err));  \
+               return;                                            \
+       }                                                          \
+} while (false)
+
+#define WARN_ON_ERROR(msg, expr) do {                              \
+       int err = (expr);                                          \
+       if (err < 0) {                                             \
+               fprintf(stderr, msg ": %s\n", snd_strerror(err));  \
+       }                                                          \
+} while (false)
+
+
+void MIDIDevice::thread_func()
+{
+       pthread_setname_np(pthread_self(), "MIDIDevice");
+
+       snd_seq_t *seq;
+       int err;
+
+       RETURN_ON_ERROR("snd_seq_open", snd_seq_open(&seq, "default", SND_SEQ_OPEN_DUPLEX, 0));
+       RETURN_ON_ERROR("snd_seq_nonblock", snd_seq_nonblock(seq, 1));
+       RETURN_ON_ERROR("snd_seq_client_name", snd_seq_set_client_name(seq, "nageru"));
+       RETURN_ON_ERROR("snd_seq_create_simple_port",
+               snd_seq_create_simple_port(seq, "nageru",
+                       SND_SEQ_PORT_CAP_READ |
+                               SND_SEQ_PORT_CAP_SUBS_READ |
+                               SND_SEQ_PORT_CAP_WRITE |
+                               SND_SEQ_PORT_CAP_SUBS_WRITE,
+                       SND_SEQ_PORT_TYPE_MIDI_GENERIC |
+                               SND_SEQ_PORT_TYPE_APPLICATION));
+
+       int queue_id = snd_seq_alloc_queue(seq);
+       RETURN_ON_ERROR("snd_seq_create_queue", queue_id);
+       RETURN_ON_ERROR("snd_seq_start_queue", snd_seq_start_queue(seq, queue_id, nullptr));
+
+       // The sequencer object is now ready to be used from other threads.
+       {
+               lock_guard<mutex> lock(mu);
+               alsa_seq = seq;
+               alsa_queue_id = queue_id;
+       }
+
+       // Listen to the announce port (0:1), which will tell us about new ports.
+       RETURN_ON_ERROR("snd_seq_connect_from", snd_seq_connect_from(seq, 0, /*client=*/0, /*port=*/1));
+
+       // Now go through all ports and subscribe to them.
+       snd_seq_client_info_t *cinfo;
+       snd_seq_client_info_alloca(&cinfo);
+
+       snd_seq_client_info_set_client(cinfo, -1);
+       while (snd_seq_query_next_client(seq, cinfo) >= 0) {
+               int client = snd_seq_client_info_get_client(cinfo);
+
+               snd_seq_port_info_t *pinfo;
+               snd_seq_port_info_alloca(&pinfo);
+
+               snd_seq_port_info_set_client(pinfo, client);
+               snd_seq_port_info_set_port(pinfo, -1);
+               while (snd_seq_query_next_port(seq, pinfo) >= 0) {
+                       constexpr int mask = SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ;
+                       if ((snd_seq_port_info_get_capability(pinfo) & mask) == mask) {
+                               lock_guard<mutex> lock(mu);
+                               subscribe_to_port_lock_held(seq, *snd_seq_port_info_get_addr(pinfo));
+                       }
+               }
+       }
+
+       int num_alsa_fds = snd_seq_poll_descriptors_count(seq, POLLIN);
+       unique_ptr<pollfd[]> fds(new pollfd[num_alsa_fds + 1]);
+
+       while (!should_quit) {
+               snd_seq_poll_descriptors(seq, fds.get(), num_alsa_fds, POLLIN);
+               fds[num_alsa_fds].fd = should_quit_fd;
+               fds[num_alsa_fds].events = POLLIN;
+               fds[num_alsa_fds].revents = 0;
+
+               err = poll(fds.get(), num_alsa_fds + 1, -1);
+               if (err == 0 || (err == -1 && errno == EINTR)) {
+                       continue;
+               }
+               if (err == -1) {
+                       perror("poll");
+                       break;
+               }
+               if (fds[num_alsa_fds].revents) {
+                       // Activity on should_quit_fd.
+                       break;
+               }
+
+               // Seemingly we can get multiple events in a single poll,
+               // and if we don't handle them all, poll will _not_ alert us!
+               while (!should_quit) {
+                       snd_seq_event_t *event;
+                       err = snd_seq_event_input(seq, &event);
+                       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;
+                       }
+                       if (event) {
+                               handle_event(seq, event);
+                       }
+               }
+       }
+}
+
+void MIDIDevice::handle_event(snd_seq_t *seq, snd_seq_event_t *event)
+{
+       if (event->source.client == snd_seq_client_id(seq)) {
+               // Ignore events we sent out ourselves.
+               return;
+       }
+
+       lock_guard<mutex> lock(mu);
+       switch (event->type) {
+       case SND_SEQ_EVENT_CONTROLLER: {
+               receiver->controller_received(event->data.control.param, event->data.control.value);
+               break;
+       }
+       case SND_SEQ_EVENT_NOTEON: {
+               receiver->note_on_received(event->data.note.note);
+               break;
+       }
+       case SND_SEQ_EVENT_PORT_START:
+               subscribe_to_port_lock_held(seq, event->data.addr);
+               break;
+       case SND_SEQ_EVENT_PORT_EXIT:
+               printf("MIDI port %d:%d went away.\n", event->data.addr.client, event->data.addr.port);
+               break;
+       case SND_SEQ_EVENT_PORT_SUBSCRIBED:
+               if (event->data.connect.sender.client != 0 &&  // Ignore system senders.
+                   event->data.connect.sender.client != snd_seq_client_id(seq) &&
+                   event->data.connect.dest.client == snd_seq_client_id(seq)) {
+                       receiver->update_num_subscribers(++num_subscribed_ports);
+               }
+               break;
+       case SND_SEQ_EVENT_PORT_UNSUBSCRIBED:
+               if (event->data.connect.sender.client != 0 &&  // Ignore system senders.
+                   event->data.connect.sender.client != snd_seq_client_id(seq) &&
+                   event->data.connect.dest.client == snd_seq_client_id(seq)) {
+                       receiver->update_num_subscribers(--num_subscribed_ports);
+               }
+               break;
+       case SND_SEQ_EVENT_NOTEOFF:
+       case SND_SEQ_EVENT_CLIENT_START:
+       case SND_SEQ_EVENT_CLIENT_EXIT:
+       case SND_SEQ_EVENT_CLIENT_CHANGE:
+       case SND_SEQ_EVENT_PORT_CHANGE:
+               break;
+       default:
+               printf("Ignoring MIDI event of unknown type %d.\n", event->type);
+       }
+}
+
+void MIDIDevice::subscribe_to_port_lock_held(snd_seq_t *seq, const snd_seq_addr_t &addr)
+{
+       // 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;
+       }
+
+       int err = snd_seq_connect_from(seq, 0, addr.client, addr.port);
+       if (err < 0) {
+               // Just print out a warning (i.e., don't die); it could
+               // very well just be e.g. another application.
+               printf("Couldn't subscribe to MIDI port %d:%d (%s).\n",
+                       addr.client, addr.port, snd_strerror(err));
+       } else {
+               printf("Subscribed to MIDI port %d:%d.\n", addr.client, addr.port);
+       }
+
+       // For sending data back.
+       err = snd_seq_connect_to(seq, 0, addr.client, addr.port);
+       if (err < 0) {
+               printf("Couldn't subscribe MIDI port %d:%d (%s) to us.\n",
+                       addr.client, addr.port, snd_strerror(err));
+       } else {
+               printf("Subscribed MIDI port %d:%d to us.\n", addr.client, addr.port);
+       }
+
+       // The current status of the device is unknown, so refresh it.
+       set<unsigned> active_lights;
+       for (const auto &it : current_light_status) {
+               if (it.second) {
+                       active_lights.insert(it.first);
+               }
+       }
+       current_light_status.clear();
+       update_lights_lock_held(active_lights);
+}
+
+void MIDIDevice::update_lights_lock_held(const set<unsigned> &active_lights)
+{
+       if (alsa_seq == nullptr) {
+               return;
+       }
+
+       unsigned num_events = 0;
+       for (unsigned note_num = 1; note_num <= 127; ++note_num) {
+               bool active = active_lights.count(note_num);
+               if (current_light_status.count(note_num) &&
+                   current_light_status[note_num] == active) {
+                       // Already known to be in the desired state.
+                       continue;
+               }
+
+               snd_seq_event_t ev;
+               snd_seq_ev_clear(&ev);
+
+               // Some devices drop events if we throw them onto them
+               // too quickly. Add a 1 ms delay for each.
+               snd_seq_real_time_t tm{0, num_events++ * 1000000};
+               snd_seq_ev_schedule_real(&ev, alsa_queue_id, true, &tm);
+               snd_seq_ev_set_source(&ev, 0);
+               snd_seq_ev_set_subs(&ev);
+
+               // For some reason, not all devices respond to note off.
+               // Use note-on with velocity of 0 (which is equivalent) instead.
+               snd_seq_ev_set_noteon(&ev, /*channel=*/0, note_num, active ? 1 : 0);
+               WARN_ON_ERROR("snd_seq_event_output", snd_seq_event_output(alsa_seq, &ev));
+               current_light_status[note_num] = active;
+       }
+       WARN_ON_ERROR("snd_seq_drain_output", snd_seq_drain_output(alsa_seq));
+}
diff --git a/nageru/midi_device.h b/nageru/midi_device.h
new file mode 100644 (file)
index 0000000..3c1e6b2
--- /dev/null
@@ -0,0 +1,56 @@
+#ifndef _MIDI_DEVICE_H
+#define _MIDI_DEVICE_H 1
+
+// MIDIDevice is a class that pools incoming MIDI messages from
+// all MIDI devices in the system, decodes them and sends them on.
+
+#include <atomic>
+#include <map>
+#include <mutex>
+#include <set>
+#include <thread>
+
+typedef struct snd_seq_addr snd_seq_addr_t;
+typedef struct snd_seq_event snd_seq_event_t;
+typedef struct _snd_seq snd_seq_t;
+
+class MIDIReceiver {
+public:
+       virtual ~MIDIReceiver() {}
+       virtual void controller_received(int controller, int value) = 0;
+       virtual void note_on_received(int note) = 0;
+       virtual void update_num_subscribers(unsigned num_subscribers) = 0;
+};
+
+class MIDIDevice {
+public:
+       MIDIDevice(MIDIReceiver *receiver);
+       ~MIDIDevice();
+       void start_thread();
+
+       void update_lights(const std::set<unsigned> &active_lights)
+       {
+               std::lock_guard<std::mutex> lock(mu);
+               update_lights_lock_held(active_lights);
+       }
+
+private:
+       void thread_func();
+       void handle_event(snd_seq_t *seq, snd_seq_event_t *event);
+       void subscribe_to_port_lock_held(snd_seq_t *seq, const snd_seq_addr_t &addr);
+       void update_lights_lock_held(const std::set<unsigned> &active_lights);
+
+       std::atomic<bool> should_quit{false};
+       int should_quit_fd;
+
+       mutable std::mutex mu;
+       MIDIReceiver *receiver;  // Under <mu>.
+
+       std::thread midi_thread;
+       std::map<unsigned, bool> current_light_status;  // Keyed by note number. Under <mu>.
+       snd_seq_t *alsa_seq{nullptr};  // Under <mu>.
+       int alsa_queue_id{-1};  // Under <mu>.
+       std::atomic<int> num_subscribed_ports{0};
+};
+
+#endif  // !defined(_MIDI_DEVICE_H)
index e858603b932f824d49e852a403fa574d94bb557d..c6d2e9c5f6c6ac8315311e35d5e7412e779d4f9b 100644 (file)
@@ -42,23 +42,11 @@ double map_controller_to_float(int val)
 }  // namespace
 
 MIDIMapper::MIDIMapper(ControllerReceiver *receiver)
-       : receiver(receiver), mapping_proto(new MIDIMappingProto)
+       : receiver(receiver), mapping_proto(new MIDIMappingProto), midi_device(this)
 {
-       should_quit_fd = eventfd(/*initval=*/0, /*flags=*/0);
-       assert(should_quit_fd != -1);
 }
 
-MIDIMapper::~MIDIMapper()
-{
-       should_quit = true;
-       const uint64_t one = 1;
-       if (write(should_quit_fd, &one, sizeof(one)) != sizeof(one)) {
-               perror("write(should_quit_fd)");
-               exit(1);
-       }
-       midi_thread.join();
-       close(should_quit_fd);
-}
+MIDIMapper::~MIDIMapper() {}
 
 bool load_midi_mapping_from_file(const string &filename, MIDIMappingProto *new_mapping)
 {
@@ -115,7 +103,7 @@ void MIDIMapper::set_midi_mapping(const MIDIMappingProto &new_mapping)
 
 void MIDIMapper::start_thread()
 {
-       midi_thread = thread(&MIDIMapper::thread_func, this);
+       midi_device.start_thread();
 }
 
 const MIDIMappingProto &MIDIMapper::get_current_mapping() const
@@ -131,299 +119,112 @@ ControllerReceiver *MIDIMapper::set_receiver(ControllerReceiver *new_receiver)
        return new_receiver;  // Now old receiver.
 }
 
-#define RETURN_ON_ERROR(msg, expr) do {                            \
-       int err = (expr);                                          \
-       if (err < 0) {                                             \
-               fprintf(stderr, msg ": %s\n", snd_strerror(err));  \
-               return;                                            \
-       }                                                          \
-} while (false)
-
-#define WARN_ON_ERROR(msg, expr) do {                              \
-       int err = (expr);                                          \
-       if (err < 0) {                                             \
-               fprintf(stderr, msg ": %s\n", snd_strerror(err));  \
-       }                                                          \
-} while (false)
-
-
-void MIDIMapper::thread_func()
+void MIDIMapper::controller_received(int controller, int value_int)
 {
-       pthread_setname_np(pthread_self(), "MIDIMapper");
-
-       snd_seq_t *seq;
-       int err;
-
-       RETURN_ON_ERROR("snd_seq_open", snd_seq_open(&seq, "default", SND_SEQ_OPEN_DUPLEX, 0));
-       RETURN_ON_ERROR("snd_seq_nonblock", snd_seq_nonblock(seq, 1));
-       RETURN_ON_ERROR("snd_seq_client_name", snd_seq_set_client_name(seq, "nageru"));
-       RETURN_ON_ERROR("snd_seq_create_simple_port",
-               snd_seq_create_simple_port(seq, "nageru",
-                       SND_SEQ_PORT_CAP_READ |
-                               SND_SEQ_PORT_CAP_SUBS_READ |
-                               SND_SEQ_PORT_CAP_WRITE |
-                               SND_SEQ_PORT_CAP_SUBS_WRITE,
-                       SND_SEQ_PORT_TYPE_MIDI_GENERIC |
-                               SND_SEQ_PORT_TYPE_APPLICATION));
-
-       int queue_id = snd_seq_alloc_queue(seq);
-       RETURN_ON_ERROR("snd_seq_create_queue", queue_id);
-       RETURN_ON_ERROR("snd_seq_start_queue", snd_seq_start_queue(seq, queue_id, nullptr));
-
-       // The sequencer object is now ready to be used from other threads.
-       {
-               lock_guard<mutex> lock(mu);
-               alsa_seq = seq;
-               alsa_queue_id = queue_id;
-       }
+       const float value = map_controller_to_float(value_int);
 
-       // Listen to the announce port (0:1), which will tell us about new ports.
-       RETURN_ON_ERROR("snd_seq_connect_from", snd_seq_connect_from(seq, 0, /*client=*/0, /*port=*/1));
+       receiver->controller_changed(controller);
 
-       // Now go through all ports and subscribe to them.
-       snd_seq_client_info_t *cinfo;
-       snd_seq_client_info_alloca(&cinfo);
-
-       snd_seq_client_info_set_client(cinfo, -1);
-       while (snd_seq_query_next_client(seq, cinfo) >= 0) {
-               int client = snd_seq_client_info_get_client(cinfo);
-
-               snd_seq_port_info_t *pinfo;
-               snd_seq_port_info_alloca(&pinfo);
-
-               snd_seq_port_info_set_client(pinfo, client);
-               snd_seq_port_info_set_port(pinfo, -1);
-               while (snd_seq_query_next_port(seq, pinfo) >= 0) {
-                       constexpr int mask = SND_SEQ_PORT_CAP_READ | SND_SEQ_PORT_CAP_SUBS_READ;
-                       if ((snd_seq_port_info_get_capability(pinfo) & mask) == mask) {
-                               lock_guard<mutex> lock(mu);
-                               subscribe_to_port_lock_held(seq, *snd_seq_port_info_get_addr(pinfo));
-                       }
-               }
-       }
-
-       int num_alsa_fds = snd_seq_poll_descriptors_count(seq, POLLIN);
-       unique_ptr<pollfd[]> fds(new pollfd[num_alsa_fds + 1]);
+       // Global controllers.
+       match_controller(controller, MIDIMappingBusProto::kLocutFieldNumber, MIDIMappingProto::kLocutBankFieldNumber,
+               value, bind(&ControllerReceiver::set_locut, receiver, _2));
+       match_controller(controller, MIDIMappingBusProto::kLimiterThresholdFieldNumber, MIDIMappingProto::kLimiterThresholdBankFieldNumber,
+               value, bind(&ControllerReceiver::set_limiter_threshold, receiver, _2));
+       match_controller(controller, MIDIMappingBusProto::kMakeupGainFieldNumber, MIDIMappingProto::kMakeupGainBankFieldNumber,
+               value, bind(&ControllerReceiver::set_makeup_gain, receiver, _2));
+
+       // Bus controllers.
+       match_controller(controller, MIDIMappingBusProto::kStereoWidthFieldNumber, MIDIMappingProto::kStereoWidthBankFieldNumber,
+               value, bind(&ControllerReceiver::set_stereo_width, receiver, _1, _2));
+       match_controller(controller, MIDIMappingBusProto::kTrebleFieldNumber, MIDIMappingProto::kTrebleBankFieldNumber,
+               value, bind(&ControllerReceiver::set_treble, receiver, _1, _2));
+       match_controller(controller, MIDIMappingBusProto::kMidFieldNumber, MIDIMappingProto::kMidBankFieldNumber,
+               value, bind(&ControllerReceiver::set_mid, receiver, _1, _2));
+       match_controller(controller, MIDIMappingBusProto::kBassFieldNumber, MIDIMappingProto::kBassBankFieldNumber,
+               value, bind(&ControllerReceiver::set_bass, receiver, _1, _2));
+       match_controller(controller, MIDIMappingBusProto::kGainFieldNumber, MIDIMappingProto::kGainBankFieldNumber,
+               value, bind(&ControllerReceiver::set_gain, receiver, _1, _2));
+       match_controller(controller, MIDIMappingBusProto::kCompressorThresholdFieldNumber, MIDIMappingProto::kCompressorThresholdBankFieldNumber,
+               value, bind(&ControllerReceiver::set_compressor_threshold, receiver, _1, _2));
+       match_controller(controller, MIDIMappingBusProto::kFaderFieldNumber, MIDIMappingProto::kFaderBankFieldNumber,
+               value, bind(&ControllerReceiver::set_fader, receiver, _1, _2));
+}
 
-       while (!should_quit) {
-               snd_seq_poll_descriptors(seq, fds.get(), num_alsa_fds, POLLIN);
-               fds[num_alsa_fds].fd = should_quit_fd;
-               fds[num_alsa_fds].events = POLLIN;
-               fds[num_alsa_fds].revents = 0;
+void MIDIMapper::note_on_received(int note)
+{
+       lock_guard<mutex> lock(mu);
+       receiver->note_on(note);
 
-               err = poll(fds.get(), num_alsa_fds + 1, -1);
-               if (err == 0 || (err == -1 && errno == EINTR)) {
-                       continue;
+       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() &&
+                   bus_mapping.prev_bank().note_number() == note) {
+                       current_controller_bank = (current_controller_bank + num_controller_banks - 1) % num_controller_banks;
+                       update_highlights();
+                       update_lights_lock_held();
                }
-               if (err == -1) {
-                       perror("poll");
-                       break;
+               if (bus_mapping.has_next_bank() &&
+                   bus_mapping.next_bank().note_number() == note) {
+                       current_controller_bank = (current_controller_bank + 1) % num_controller_banks;
+                       update_highlights();
+                       update_lights_lock_held();
                }
-               if (fds[num_alsa_fds].revents) {
-                       // Activity on should_quit_fd.
-                       break;
+               if (bus_mapping.has_select_bank_1() &&
+                   bus_mapping.select_bank_1().note_number() == note) {
+                       current_controller_bank = 0;
+                       update_highlights();
+                       update_lights_lock_held();
                }
-
-               // Seemingly we can get multiple events in a single poll,
-               // and if we don't handle them all, poll will _not_ alert us!
-               while (!should_quit) {
-                       snd_seq_event_t *event;
-                       err = snd_seq_event_input(seq, &event);
-                       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;
-                       }
-                       if (event) {
-                               handle_event(seq, event);
-                       }
+               if (bus_mapping.has_select_bank_2() &&
+                   bus_mapping.select_bank_2().note_number() == note &&
+                   num_controller_banks >= 2) {
+                       current_controller_bank = 1;
+                       update_highlights();
+                       update_lights_lock_held();
                }
-       }
-}
-
-void MIDIMapper::handle_event(snd_seq_t *seq, snd_seq_event_t *event)
-{
-       if (event->source.client == snd_seq_client_id(seq)) {
-               // Ignore events we sent out ourselves.
-               return;
-       }
-
-       lock_guard<mutex> lock(mu);
-       switch (event->type) {
-       case SND_SEQ_EVENT_CONTROLLER: {
-               const int controller = event->data.control.param;
-               const float value = map_controller_to_float(event->data.control.value);
-
-               receiver->controller_changed(controller);
-
-               // Global controllers.
-               match_controller(controller, MIDIMappingBusProto::kLocutFieldNumber, MIDIMappingProto::kLocutBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_locut, receiver, _2));
-               match_controller(controller, MIDIMappingBusProto::kLimiterThresholdFieldNumber, MIDIMappingProto::kLimiterThresholdBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_limiter_threshold, receiver, _2));
-               match_controller(controller, MIDIMappingBusProto::kMakeupGainFieldNumber, MIDIMappingProto::kMakeupGainBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_makeup_gain, receiver, _2));
-
-               // Bus controllers.
-               match_controller(controller, MIDIMappingBusProto::kStereoWidthFieldNumber, MIDIMappingProto::kStereoWidthBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_stereo_width, receiver, _1, _2));
-               match_controller(controller, MIDIMappingBusProto::kTrebleFieldNumber, MIDIMappingProto::kTrebleBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_treble, receiver, _1, _2));
-               match_controller(controller, MIDIMappingBusProto::kMidFieldNumber, MIDIMappingProto::kMidBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_mid, receiver, _1, _2));
-               match_controller(controller, MIDIMappingBusProto::kBassFieldNumber, MIDIMappingProto::kBassBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_bass, receiver, _1, _2));
-               match_controller(controller, MIDIMappingBusProto::kGainFieldNumber, MIDIMappingProto::kGainBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_gain, receiver, _1, _2));
-               match_controller(controller, MIDIMappingBusProto::kCompressorThresholdFieldNumber, MIDIMappingProto::kCompressorThresholdBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_compressor_threshold, receiver, _1, _2));
-               match_controller(controller, MIDIMappingBusProto::kFaderFieldNumber, MIDIMappingProto::kFaderBankFieldNumber,
-                       value, bind(&ControllerReceiver::set_fader, receiver, _1, _2));
-               break;
-       }
-       case SND_SEQ_EVENT_NOTEON: {
-               const int note = event->data.note.note;
-
-               receiver->note_on(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() &&
-                           bus_mapping.prev_bank().note_number() == note) {
-                               current_controller_bank = (current_controller_bank + num_controller_banks - 1) % num_controller_banks;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
-                       if (bus_mapping.has_next_bank() &&
-                           bus_mapping.next_bank().note_number() == note) {
-                               current_controller_bank = (current_controller_bank + 1) % num_controller_banks;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
-                       if (bus_mapping.has_select_bank_1() &&
-                           bus_mapping.select_bank_1().note_number() == note) {
-                               current_controller_bank = 0;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
-                       if (bus_mapping.has_select_bank_2() &&
-                           bus_mapping.select_bank_2().note_number() == note &&
-                           num_controller_banks >= 2) {
-                               current_controller_bank = 1;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
-                       if (bus_mapping.has_select_bank_3() &&
-                           bus_mapping.select_bank_3().note_number() == note &&
-                           num_controller_banks >= 3) {
-                               current_controller_bank = 2;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
-                       if (bus_mapping.has_select_bank_4() &&
-                           bus_mapping.select_bank_4().note_number() == note &&
-                           num_controller_banks >= 4) {
-                               current_controller_bank = 3;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
-                       if (bus_mapping.has_select_bank_5() &&
-                           bus_mapping.select_bank_5().note_number() == note &&
-                           num_controller_banks >= 5) {
-                               current_controller_bank = 4;
-                               update_highlights();
-                               update_lights_lock_held();
-                       }
+               if (bus_mapping.has_select_bank_3() &&
+                   bus_mapping.select_bank_3().note_number() == note &&
+                   num_controller_banks >= 3) {
+                       current_controller_bank = 2;
+                       update_highlights();
+                       update_lights_lock_held();
                }
-
-               match_button(note, MIDIMappingBusProto::kToggleLocutFieldNumber, MIDIMappingProto::kToggleLocutBankFieldNumber,
-                       bind(&ControllerReceiver::toggle_locut, receiver, _1));
-               match_button(note, MIDIMappingBusProto::kToggleAutoGainStagingFieldNumber, MIDIMappingProto::kToggleAutoGainStagingBankFieldNumber,
-                       bind(&ControllerReceiver::toggle_auto_gain_staging, receiver, _1));
-               match_button(note, MIDIMappingBusProto::kToggleCompressorFieldNumber, MIDIMappingProto::kToggleCompressorBankFieldNumber,
-                       bind(&ControllerReceiver::toggle_compressor, receiver, _1));
-               match_button(note, MIDIMappingBusProto::kClearPeakFieldNumber, MIDIMappingProto::kClearPeakBankFieldNumber,
-                       bind(&ControllerReceiver::clear_peak, receiver, _1));
-               match_button(note, MIDIMappingBusProto::kToggleMuteFieldNumber, MIDIMappingProto::kClearPeakBankFieldNumber,
-                       bind(&ControllerReceiver::toggle_mute, receiver, _1));
-               match_button(note, MIDIMappingBusProto::kToggleLimiterFieldNumber, MIDIMappingProto::kToggleLimiterBankFieldNumber,
-                       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);
-               break;
-       case SND_SEQ_EVENT_PORT_EXIT:
-               printf("MIDI port %d:%d went away.\n", event->data.addr.client, event->data.addr.port);
-               break;
-       case SND_SEQ_EVENT_PORT_SUBSCRIBED:
-               if (event->data.connect.sender.client != 0 &&  // Ignore system senders.
-                   event->data.connect.sender.client != snd_seq_client_id(seq) &&
-                   event->data.connect.dest.client == snd_seq_client_id(seq)) {
-                       ++num_subscribed_ports;
+               if (bus_mapping.has_select_bank_4() &&
+                   bus_mapping.select_bank_4().note_number() == note &&
+                   num_controller_banks >= 4) {
+                       current_controller_bank = 3;
                        update_highlights();
+                       update_lights_lock_held();
                }
-               break;
-       case SND_SEQ_EVENT_PORT_UNSUBSCRIBED:
-               if (event->data.connect.sender.client != 0 &&  // Ignore system senders.
-                   event->data.connect.sender.client != snd_seq_client_id(seq) &&
-                   event->data.connect.dest.client == snd_seq_client_id(seq)) {
-                       --num_subscribed_ports;
+               if (bus_mapping.has_select_bank_5() &&
+                   bus_mapping.select_bank_5().note_number() == note &&
+                   num_controller_banks >= 5) {
+                       current_controller_bank = 4;
                        update_highlights();
+                       update_lights_lock_held();
                }
-               break;
-       case SND_SEQ_EVENT_NOTEOFF:
-       case SND_SEQ_EVENT_CLIENT_START:
-       case SND_SEQ_EVENT_CLIENT_EXIT:
-       case SND_SEQ_EVENT_CLIENT_CHANGE:
-       case SND_SEQ_EVENT_PORT_CHANGE:
-               break;
-       default:
-               printf("Ignoring MIDI event of unknown type %d.\n", event->type);
        }
+
+       match_button(note, MIDIMappingBusProto::kToggleLocutFieldNumber, MIDIMappingProto::kToggleLocutBankFieldNumber,
+               bind(&ControllerReceiver::toggle_locut, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kToggleAutoGainStagingFieldNumber, MIDIMappingProto::kToggleAutoGainStagingBankFieldNumber,
+               bind(&ControllerReceiver::toggle_auto_gain_staging, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kToggleCompressorFieldNumber, MIDIMappingProto::kToggleCompressorBankFieldNumber,
+               bind(&ControllerReceiver::toggle_compressor, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kClearPeakFieldNumber, MIDIMappingProto::kClearPeakBankFieldNumber,
+               bind(&ControllerReceiver::clear_peak, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kToggleMuteFieldNumber, MIDIMappingProto::kClearPeakBankFieldNumber,
+               bind(&ControllerReceiver::toggle_mute, receiver, _1));
+       match_button(note, MIDIMappingBusProto::kToggleLimiterFieldNumber, MIDIMappingProto::kToggleLimiterBankFieldNumber,
+               bind(&ControllerReceiver::toggle_limiter, receiver));
+       match_button(note, MIDIMappingBusProto::kToggleAutoMakeupGainFieldNumber, MIDIMappingProto::kToggleAutoMakeupGainBankFieldNumber,
+               bind(&ControllerReceiver::toggle_auto_makeup_gain, receiver));
 }
 
-void MIDIMapper::subscribe_to_port_lock_held(snd_seq_t *seq, const snd_seq_addr_t &addr)
+void MIDIMapper::update_num_subscribers(unsigned num_subscribers)
 {
-       // 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;
-       }
-
-       int err = snd_seq_connect_from(seq, 0, addr.client, addr.port);
-       if (err < 0) {
-               // Just print out a warning (i.e., don't die); it could
-               // very well just be e.g. another application.
-               printf("Couldn't subscribe to MIDI port %d:%d (%s).\n",
-                       addr.client, addr.port, snd_strerror(err));
-       } else {
-               printf("Subscribed to MIDI port %d:%d.\n", addr.client, addr.port);
-       }
-
-       // For sending data back.
-       err = snd_seq_connect_to(seq, 0, addr.client, addr.port);
-       if (err < 0) {
-               printf("Couldn't subscribe MIDI port %d:%d (%s) to us.\n",
-                       addr.client, addr.port, snd_strerror(err));
-       } else {
-               printf("Subscribed MIDI port %d:%d to us.\n", addr.client, addr.port);
-       }
-
-       current_light_status.clear();  // The current state of the device is unknown.
-       update_lights_lock_held();
+       num_subscribed_ports = num_subscribers;
+       update_highlights();
 }
 
 void MIDIMapper::match_controller(int controller, int field_number, int bank_field_number, float value, function<void(unsigned, float)> func)
@@ -572,7 +373,7 @@ void MIDIMapper::update_highlights()
 
 void MIDIMapper::update_lights_lock_held()
 {
-       if (alsa_seq == nullptr || global_audio_mixer == nullptr) {
+       if (global_audio_mixer == nullptr) {
                return;
        }
 
@@ -617,32 +418,7 @@ void MIDIMapper::update_lights_lock_held()
                }
        }
 
-       unsigned num_events = 0;
-       for (unsigned note_num = 1; note_num <= 127; ++note_num) {
-               bool active = active_lights.count(note_num);
-               if (current_light_status.count(note_num) &&
-                   current_light_status[note_num] == active) {
-                       // Already known to be in the desired state.
-                       continue;
-               }
-
-               snd_seq_event_t ev;
-               snd_seq_ev_clear(&ev);
-
-               // Some devices drop events if we throw them onto them
-               // too quickly. Add a 1 ms delay for each.
-               snd_seq_real_time_t tm{0, num_events++ * 1000000};
-               snd_seq_ev_schedule_real(&ev, alsa_queue_id, true, &tm);
-               snd_seq_ev_set_source(&ev, 0);
-               snd_seq_ev_set_subs(&ev);
-
-               // For some reason, not all devices respond to note off.
-               // Use note-on with velocity of 0 (which is equivalent) instead.
-               snd_seq_ev_set_noteon(&ev, /*channel=*/0, note_num, active ? 1 : 0);
-               WARN_ON_ERROR("snd_seq_event_output", snd_seq_event_output(alsa_seq, &ev));
-               current_light_status[note_num] = active;
-       }
-       WARN_ON_ERROR("snd_seq_drain_output", snd_seq_drain_output(alsa_seq));
+       midi_device.update_lights(active_lights);
 }
 
 void MIDIMapper::activate_lights(unsigned bus_idx, int field_number, set<unsigned> *active_lights)
index 42bf19a64aeb68388fe41722bf1727d4dcde1431..3d7a341f96bd0ad193213e753181805364d82023 100644 (file)
@@ -1,9 +1,9 @@
 #ifndef _MIDI_MAPPER_H
 #define _MIDI_MAPPER_H 1
 
-// MIDIMapper is a class that listens for incoming MIDI messages from
-// mixer controllers (ie., it is not meant to be used with regular
-// instruments), interprets them according to a device-specific, user-defined
+// MIDIMapper is a class that gets incoming MIDI messages from mixer
+// controllers (ie., it is not meant to be used with regular instruments)
+// via MIDIDevice, interprets them according to a device-specific, user-defined
 // mapping, and calls back into a receiver (typically the MainWindow).
 // This way, it is possible to control audio functionality using physical
 // pots and faders instead of the mouse.
 #include <thread>
 
 #include "defs.h"
+#include "midi_device.h"
 
 class MIDIMappingProto;
-typedef struct snd_seq_addr snd_seq_addr_t;
-typedef struct snd_seq_event snd_seq_event_t;
-typedef struct _snd_seq snd_seq_t;
 
 // Interface for receiving interpreted controller messages.
 class ControllerReceiver {
@@ -79,7 +77,7 @@ public:
        virtual void note_on(unsigned note) = 0;
 };
 
-class MIDIMapper {
+class MIDIMapper : public MIDIReceiver {
 public:
        MIDIMapper(ControllerReceiver *receiver);
        virtual ~MIDIMapper();
@@ -98,10 +96,12 @@ public:
                this->has_peaked[bus_idx] = has_peaked;
        }
 
+       // MIDIReceiver.
+       void controller_received(int controller, int value) override;
+       void note_on_received(int note) override;
+       void update_num_subscribers(unsigned num_subscribers) override;
+
 private:
-       void thread_func();
-       void handle_event(snd_seq_t *seq, snd_seq_event_t *event);
-       void subscribe_to_port_lock_held(snd_seq_t *seq, const snd_seq_addr_t &addr);
        void match_controller(int controller, int field_number, int bank_field_number, float value, std::function<void(unsigned, float)> func);
        void match_button(int note, int field_number, int bank_field_number, std::function<void(unsigned)> func);
        bool has_active_controller(unsigned bus_idx, int field_number, int bank_field_number);  // Also works for buttons.
@@ -125,10 +125,7 @@ private:
        std::atomic<int> current_controller_bank{0};
        std::atomic<int> num_subscribed_ports{0};
 
-       std::thread midi_thread;
-       std::map<unsigned, bool> current_light_status;  // Keyed by note number. Under <mu>.
-       snd_seq_t *alsa_seq{nullptr};  // Under <mu>.
-       int alsa_queue_id{-1};  // Under <mu>.
+       MIDIDevice midi_device;
 };
 
 bool load_midi_mapping_from_file(const std::string &filename, MIDIMappingProto *new_mapping);