X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=27676e3f9480e750e97427e86ce748e38fb44197;hb=4b0234d5b2bce39ce701d0bf264ab2257e7ddd01;hp=5485bdffaad31ce476f733b714d5f070802772cd;hpb=c18585d1f7b4476c74c4c5a064cb3ce357c644ae;p=nageru

diff --git a/futatabi/player.h b/futatabi/player.h
index 5485bdf..27676e3 100644
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -33,7 +33,7 @@ public:
 	~Player();
 
 	void play(const std::vector<Clip> &clips);
-	void override_angle(unsigned stream_idx);  // For the current clip only.
+	void override_angle(unsigned stream_idx);  // Assumes one-clip playlist only.
 
 	// Not thread-safe to set concurrently with playing.
 	// Will be called back from the player thread.
@@ -51,7 +51,9 @@ public:
 	void release_queue_spot() override;
 
 private:
-	void thread_func(StreamOutput stream_output, AVFormatContext *file_avctx);
+	void thread_func(AVFormatContext *file_avctx);
+	void play_playlist_once();
+	void display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, std::chrono::steady_clock::time_point frame_start, bool snapped);
 	void open_output_stream();
 	static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 	int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
@@ -91,6 +93,10 @@ private:
 	// its lock and can sleep on it.
 	size_t num_queued_frames = 0;
 	static constexpr size_t max_queued_frames = 10;
+
+	// State private to the player thread.
+	int64_t pts = 0;
+	const StreamOutput stream_output;
 };
 
 #endif  // !defined(_PLAYER_H)