X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=e64abd79f7b834b0f6521829576da8e4ef8bc9f5;hb=b7a32af3a037f9fa70cf54f992314f68279c1204;hp=c8ed083fd544899124f749926c9598a0b0f9d235;hpb=4d7015171fbd6c36c480d1d7992b76bbb45410c5;p=nageru

diff --git a/futatabi/player.h b/futatabi/player.h
index c8ed083..e64abd7 100644
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -30,17 +30,42 @@ public:
 	Player(JPEGFrameView *destination, StreamOutput stream_output, AVFormatContext *file_avctx = nullptr);
 	~Player();
 
-	struct ClipWithRow {
-		Clip clip;
-		size_t row;  // Used for progress callback only.
-	};
 	void play(const Clip &clip)
 	{
-		play({ ClipWithRow{ clip, 0 } });
+		play({ ClipWithID{ clip, 0 } });
 	}
-	void play(const std::vector<ClipWithRow> &clips);
+	void play(const std::vector<ClipWithID> &clips);
 	void override_angle(unsigned stream_idx);  // Assumes one-clip playlist only.
 
+	// Replace the part of the playlist that we haven't started playing yet
+	// (ie., from the point immediately after the last current playing clip
+	// and to the end) with the given one.
+	//
+	// E.g., if we have the playlist A, B, C, D, E, F, we're currently in a fade
+	// from B to C and run splice_play() with the list G, C, H, I, the resulting
+	// list will be A, B, C, H, I. (If the new list doesn't contain B nor C,
+	// there will be some heuristics.) Note that we always compare on ID only;
+	// changes will be ignored for the purposes of setting the split point,
+	// although the newly-spliced entries will of course get the new in/out points
+	// etc., which is the main reason for going through this exercise in the first
+	// place.
+	//
+	// If nothing is playing, the call will be ignored.
+	void splice_play(const std::vector<ClipWithID> &clips);
+
+	// Set the status string that will be used for the video stream's status subtitles
+	// whenever we are not playing anything.
+	void set_pause_status(const std::string &status)
+	{
+		std::lock_guard<std::mutex> lock(queue_state_mu);
+		pause_status = status;
+	}
+
+	void set_master_speed(float speed)
+	{
+		change_master_speed = speed;
+	}
+
 	// Not thread-safe to set concurrently with playing.
 	// Will be called back from the player thread.
 	using done_callback_func = std::function<void()>;
@@ -49,7 +74,7 @@ public:
 	// Not thread-safe to set concurrently with playing.
 	// Will be called back from the player thread.
 	// The keys in the given map are row members in the vector given to play().
-	using progress_callback_func = std::function<void(const std::map<size_t, double> &progress, double time_remaining)>;
+	using progress_callback_func = std::function<void(const std::map<uint64_t, double> &progress, double time_remaining)>;
 	void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
 
 	// QueueInterface.
@@ -59,7 +84,7 @@ public:
 private:
 	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 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, const std::string &subtitle);
 	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);
@@ -70,6 +95,7 @@ private:
 
 	std::thread player_thread;
 	std::atomic<bool> should_quit{ false };
+	std::atomic<float> change_master_speed{ 0.0f / 0.0f };
 
 	JPEGFrameView *destination;
 	done_callback_func done_callback;
@@ -77,12 +103,16 @@ private:
 
 	std::mutex queue_state_mu;
 	std::condition_variable new_clip_changed;
-	std::vector<ClipWithRow> queued_clip_list;  // Under queue_state_mu.
+	std::vector<ClipWithID> queued_clip_list;  // Under queue_state_mu.
 	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.
 	int64_t last_pts_played = -1;  // Under queue_state_mu. Used by previews only.
 
+	bool splice_ready = false;  // Under queue_state_mu.
+	std::vector<ClipWithID> to_splice_clip_list;  // Under queue_state_mu.
+	std::string pause_status = "paused";  // Under queue_state_mu.
+
 	std::unique_ptr<VideoStream> video_stream;  // Can be nullptr.
 
 	std::atomic<int64_t> metric_dropped_interpolated_frame{ 0 };
@@ -105,11 +135,13 @@ private:
 	const StreamOutput stream_output;
 };
 
-double compute_time_left(const std::vector<Player::ClipWithRow> &clips, size_t currently_playing_idx, double progress_currently_playing);
+double compute_time_left(const std::vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing);
 
-static inline double compute_total_time(const std::vector<Player::ClipWithRow> &clips)
+static inline double compute_total_time(const std::vector<ClipWithID> &clips)
 {
 	return compute_time_left(clips, 0, 0.0);
 }
 
+std::string format_duration(double t);
+
 #endif  // !defined(_PLAYER_H)