X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=33c17239772ea1bd92e19ca539054140becf5bb4;hb=4d334dafa066cf9af7899a555e1145d1e4dd0b3d;hp=d2e861ee59434128e35ab3788c0ebaaeaa7ecc73;hpb=35fa8cce99a5d224609bde5bef15d13367506804;p=nageru diff --git a/futatabi/player.h b/futatabi/player.h index d2e861e..33c1723 100644 --- a/futatabi/player.h +++ b/futatabi/player.h @@ -37,6 +37,22 @@ public: void play(const std::vector &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 &clips); + // Not thread-safe to set concurrently with playing. // Will be called back from the player thread. using done_callback_func = std::function; @@ -79,6 +95,9 @@ private: 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 to_splice_clip_list; // Under queue_state_mu. + std::unique_ptr video_stream; // Can be nullptr. std::atomic metric_dropped_interpolated_frame{ 0 };