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

diff --git a/futatabi/player.h b/futatabi/player.h
index c8ed083..33c1723 100644
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -30,17 +30,29 @@ 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);
+
 	// 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 +61,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.
@@ -77,12 +89,15 @@ 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::unique_ptr<VideoStream> video_stream;  // Can be nullptr.
 
 	std::atomic<int64_t> metric_dropped_interpolated_frame{ 0 };
@@ -105,9 +120,9 @@ 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);
 }