X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fmidi_mapper.h;h=2240e70ce7e55854028b40d885201388935f9bb2;hb=fcae09355c1a00a68015b3d727339aebd2e52aa4;hp=96e9f198cd12f37035c6f8e1cad2fe9e0ac98288;hpb=a6f3a2275ad116e6ab338e583ab8ef1b1141b468;p=nageru

diff --git a/futatabi/midi_mapper.h b/futatabi/midi_mapper.h
index 96e9f19..2240e70 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,8 +31,10 @@ public:
 	virtual void preview() = 0;
 	virtual void queue() = 0;
 	virtual void play() = 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;
 	virtual void cue_in() = 0;
 	virtual void cue_out() = 0;
 
@@ -44,6 +45,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);
@@ -63,10 +71,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_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();
@@ -84,7 +96,6 @@ 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;
@@ -97,7 +108,8 @@ private:
 
 	std::atomic<bool> preview_enabled_light{false};
 	std::atomic<bool> queue_enabled_light{false};
-	std::atomic<bool> play_enabled_light{false};
+	std::atomic<LightState> play_enabled_light{Off};
+	std::atomic<LightState> locked_light{On};
 	std::atomic<int> current_highlighted_camera{-1};
 
 	MIDIDevice midi_device;