Write 1.4.0 changelog.

[nageru] / midi_mapper.h

diff --git a/midi_mapper.h b/midi_mapper.h
index 0a6694bd6a6ca0bcf85b78033acb53a68ffc27b2..04e5192ecb0d69a432cc159b83553f0827d37e75 100644 (file)
--- a/midi_mapper.h
+++ b/midi_mapper.h
@@ -10,11 +10,15 @@
 
 #include <atomic>
 #include <functional>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <set>
 #include <string>
 #include <thread>
 
+#include "defs.h"
+
 class MIDIMappingProto;
 typedef struct snd_seq_addr snd_seq_addr_t;
 typedef struct snd_seq_event snd_seq_event_t;
@@ -35,10 +39,13 @@ public:
        virtual void set_compressor_threshold(unsigned bus_idx, float value) = 0;
        virtual void set_fader(unsigned bus_idx, float value) = 0;
 
+       virtual void toggle_mute(unsigned bus_idx) = 0;
        virtual void toggle_locut(unsigned bus_idx) = 0;
        virtual void toggle_auto_gain_staging(unsigned bus_idx) = 0;
        virtual void toggle_compressor(unsigned bus_idx) = 0;
        virtual void clear_peak(unsigned bus_idx) = 0;
+       virtual void toggle_limiter() = 0;
+       virtual void toggle_auto_makeup_gain() = 0;
 
        // Signals to highlight controls to mark them to the user
        // as MIDI-controllable (or not).
@@ -55,10 +62,13 @@ public:
        virtual void highlight_compressor_threshold(unsigned bus_idx, bool highlight) = 0;
        virtual void highlight_fader(unsigned bus_idx, bool highlight) = 0;
 
+       virtual void highlight_mute(unsigned bus_idx, bool highlight) = 0;
        virtual void highlight_toggle_locut(unsigned bus_idx, bool highlight) = 0;
        virtual void highlight_toggle_auto_gain_staging(unsigned bus_idx, bool highlight) = 0;
        virtual void highlight_toggle_compressor(unsigned bus_idx, bool highlight) = 0;
        virtual void highlight_clear_peak(unsigned bus_idx, bool highlight) = 0;
+       virtual void highlight_toggle_limiter(bool highlight) = 0;
+       virtual void highlight_toggle_auto_makeup_gain(bool highlight) = 0;
 
        // Raw events; used for the editor dialog only.
        virtual void controller_changed(unsigned controller) = 0;
@@ -77,11 +87,17 @@ public:
        ControllerReceiver *set_receiver(ControllerReceiver *new_receiver);
 
        void refresh_highlights();
+       void refresh_lights();
+
+       void set_has_peaked(unsigned bus_idx, bool has_peaked)
+       {
+               this->has_peaked[bus_idx] = has_peaked;
+       }
 
 private:
        void thread_func();
        void handle_event(snd_seq_t *seq, snd_seq_event_t *event);
-       void subscribe_to_port(snd_seq_t *seq, const snd_seq_addr_t &addr);
+       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.
@@ -89,16 +105,26 @@ private:
 
        void update_highlights();
 
+       void update_lights_lock_held();
+       void activate_lights(unsigned bus_idx, int field_number, std::set<unsigned> *active_lights);
+       void activate_lights_all_buses(int field_number, std::set<unsigned> *active_lights);
+
        std::atomic<bool> should_quit{false};
        int should_quit_fd;
 
-       mutable std::mutex mapping_mu;
-       ControllerReceiver *receiver;  // Under <mapping_mu>.
-       std::unique_ptr<MIDIMappingProto> mapping_proto;  // Under <mapping_mu>.
-       int num_controller_banks;  // Under <mapping_mu>.
+       std::atomic<bool> has_peaked[MAX_BUSES] {{ false }};
+
+       mutable std::mutex mu;
+       ControllerReceiver *receiver;  // Under <mu>.
+       std::unique_ptr<MIDIMappingProto> mapping_proto;  // Under <mu>.
+       int num_controller_banks;  // Under <mu>.
        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>.
 };
 
 bool load_midi_mapping_from_file(const std::string &filename, MIDIMappingProto *new_mapping);