X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.h;h=84ff404b1f0b956830a475f4cf18318680a5e461;hb=02ea864dc5a6dde7450c497581ff18d784ab832c;hp=0dd14cec2ecabd059298e8931703909afc7d7723;hpb=2c9a83aeae44dae6a0bbfbae33719976e6d527af;p=nageru

diff --git a/futatabi/midi_mapper.h b/futatabi/midi_mapper.h
index 0dd14ce..84ff404 100644
--- a/futatabi/midi_mapper.h
+++ b/futatabi/midi_mapper.h
@@ -15,7 +15,6 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <set>
 #include <string>
 #include <thread>
 
@@ -32,6 +31,8 @@ public:
 	virtual void preview() = 0;
 	virtual void queue() = 0;
 	virtual void play() = 0;
+	virtual void next() = 0;
+	virtual void toggle_lock() = 0;
 	virtual void jog(int delta) = 0;
 	virtual void switch_camera(unsigned camera_idx) = 0;
 	virtual void set_master_speed(float speed) = 0;
@@ -45,6 +46,13 @@ public:
 
 class MIDIMapper : public MIDIReceiver {
 public:
+	// Converts conveniently from a bool.
+	enum LightState {
+		Off = 0,
+		On = 1,
+		Blinking = 2
+	};
+
 	MIDIMapper(ControllerReceiver *receiver);
 	virtual ~MIDIMapper();
 	void set_midi_mapping(const MIDIMappingProto &new_mapping);
@@ -56,7 +64,7 @@ public:
 
 	void refresh_lights();
 
-	void set_preview_enabled(bool enabled) {
+	void set_preview_enabled(LightState enabled) {
 		preview_enabled_light = enabled;
 		refresh_lights();
 	}
@@ -64,14 +72,26 @@ public:
 		queue_enabled_light = enabled;
 		refresh_lights();
 	}
-	void set_play_enabled(bool enabled) {
+	void set_play_enabled(LightState enabled) {
 		play_enabled_light = enabled;
 		refresh_lights();
 	}
+	void set_next_ready(LightState enabled) {
+		next_ready_light = enabled;
+		refresh_lights();
+	}
+	void set_locked(LightState locked) {
+		locked_light = locked;
+		refresh_lights();
+	}
 	void highlight_camera_input(int stream_idx) {  // -1 for none.
 		current_highlighted_camera = stream_idx;
 		refresh_lights();
 	}
+	void set_speed_light(float speed) {  // Goes from 0.0 to 2.0.
+		current_speed = speed;
+		refresh_lights();
+	}
 
 	// MIDIReceiver.
 	void controller_received(int controller, int value) override;
@@ -85,10 +105,8 @@ private:
 	bool bank_mismatch(int bank_field_number);
 
 	void update_lights_lock_held();
-	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 mu;
 	ControllerReceiver *receiver;  // Under <mu>.
@@ -96,10 +114,13 @@ private:
 	int num_controller_banks;  // Under <mu>.
 	std::atomic<int> current_controller_bank{0};
 
-	std::atomic<bool> preview_enabled_light{false};
+	std::atomic<LightState> preview_enabled_light{Off};
 	std::atomic<bool> queue_enabled_light{false};
-	std::atomic<bool> play_enabled_light{false};
+	std::atomic<LightState> play_enabled_light{Off};
+	std::atomic<LightState> next_ready_light{Off};
+	std::atomic<LightState> locked_light{On};
 	std::atomic<int> current_highlighted_camera{-1};
+	std::atomic<float> current_speed{1.0f};
 
 	MIDIDevice midi_device;
 };