X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=player.h;h=e251c6e86d8f20446e8692361bad34c2123d15bd;hb=804409c84346fc01270a388e099b8a99528ed0c6;hp=debf9194474baacacefdc448b14e5bbce6caecfa;hpb=d357bff359e00a9ad8e5a1d7ec70d0653db46398;p=nageru

diff --git a/player.h b/player.h
index debf919..e251c6e 100644
--- a/player.h
+++ b/player.h
@@ -4,6 +4,7 @@
 #include "clip_list.h"
 
 #include <condition_variable>
+#include <functional>
 #include <mutex>
 
 class JPEGFrameView;
@@ -13,19 +14,28 @@ public:
 	Player(JPEGFrameView *destination);
 
 	void play_clip(const Clip &clip, unsigned stream_idx);
+	void override_angle(unsigned stream_idx);  // For the current clip only.
+
+	// Not thread-safe to set concurrently with playing.
+	// Will be called back from the player thread.
+	using done_callback_func = std::function<void()>;
+	void set_done_callback(done_callback_func cb) { done_callback = cb; }
 
 private:
 	void thread_func();
 
 	JPEGFrameView *destination;
+	done_callback_func done_callback;
 
 	std::mutex mu;
-	Clip current_clip;  // Under mu.
+	Clip current_clip;  // Under mu. Can have pts_in = -1 for no clip.
 	unsigned current_stream_idx;  // Under mu.
 
-	enum { PAUSED, PLAYING } cue_state = PAUSED;  // Under cue_state_mu.
-	std::mutex cue_state_mu;
-	std::condition_variable cue_is_playing;
+	std::mutex queue_state_mu;
+	std::condition_variable new_clip_changed;
+	bool new_clip_ready = false;  // Under queue_state_mu.
+	bool playing = false;  // Under queue_state_mu.
+	int override_stream_idx = -1;  // Under queue_state_mu.
 };
 
 #endif  // !defined(_PLAYER_H)