X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=futatabi%2Fmidi_mapper.h;h=84ff404b1f0b956830a475f4cf18318680a5e461;hp=abaadaf44842032610d7d982e7408a229b9019fa;hb=refs%2Fheads%2Fmaster;hpb=b7a32af3a037f9fa70cf54f992314f68279c1204

diff --git a/futatabi/midi_mapper.h b/futatabi/midi_mapper.h
index abaadaf..84ff404 100644
--- a/futatabi/midi_mapper.h
+++ b/futatabi/midi_mapper.h
@@ -31,6 +31,7 @@ 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;
@@ -63,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();
 	}
@@ -71,10 +72,14 @@ 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();
@@ -83,6 +88,10 @@ public:
 		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;
@@ -98,7 +107,6 @@ private:
 	void update_lights_lock_held();
 
 	std::atomic<bool> should_quit{false};
-	int should_quit_fd;
 
 	mutable std::mutex mu;
 	ControllerReceiver *receiver;  // Under <mu>.
@@ -106,11 +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;
 };