Make the save and load buttons in the MIDI mapping edit dialog work.

[nageru] / midi_mapper.h

diff --git a/midi_mapper.h b/midi_mapper.h
index 0c7bb606e05095a58c5e18101f136b71733948be..357666d5a1fb89eea2f02a6267ab0b973d87e0a1 100644 (file)
--- a/midi_mapper.h
+++ b/midi_mapper.h
@@ -11,10 +11,12 @@
 #include <atomic>
 #include <functional>
 #include <memory>
+#include <mutex>
 #include <string>
 #include <thread>
 
 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;
 
@@ -45,11 +47,12 @@ public:
        virtual ~MIDIMapper();
        void set_midi_mapping(const MIDIMappingProto &new_mapping);
        void start_thread();
-       const MIDIMappingProto &get_current_mapping() const { return *mapping_proto; }
+       const MIDIMappingProto &get_current_mapping() const;
 
 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 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 bank_mismatch(int bank_field_number);
@@ -58,13 +61,15 @@ private:
        std::atomic<bool> should_quit{false};
        int should_quit_fd;
 
-       std::unique_ptr<MIDIMappingProto> mapping_proto;
-       int num_controller_banks;
-       int current_controller_bank = 0;
+       mutable std::mutex mapping_mu;
+       std::unique_ptr<MIDIMappingProto> mapping_proto;  // Under <mapping_mu>.
+       int num_controller_banks;  // Under <mapping_mu>.
+       std::atomic<int> current_controller_bank{0};
 
        std::thread midi_thread;
 };
 
 bool load_midi_mapping_from_file(const std::string &filename, MIDIMappingProto *new_mapping);
+bool save_midi_mapping_to_file(const MIDIMappingProto &mapping_proto, const std::string &filename);
 
 #endif  // !defined(_MIDI_MAPPER_H)