X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=876c8dcac6b95684e54a4cfb3f354eed8331806c;hb=9966c32542c522588e3aee2e8089f42ec485e06f;hp=ce165d03f90461066e38cd312a76ef27948b0eea;hpb=46ab69c1586b8920ce2735bdf2a0bbc811ee48fd;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index ce165d0..876c8dc 100644
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -151,6 +151,7 @@ void Player::play_playlist_once()
 		return;
 	}
 
+	should_skip_to_next = false;  // To make sure we don't have a lingering click from before play.
 	steady_clock::time_point origin = steady_clock::now();  // TODO: Add a 100 ms buffer for ramp-up?
 	int64_t in_pts_origin = clip_list[0].clip.pts_in;
 	for (size_t clip_idx = 0; clip_idx < clip_list.size(); ++clip_idx) {
@@ -181,7 +182,7 @@ void Player::play_playlist_once()
 		}
 
 		steady_clock::time_point next_frame_start;
-		for (int frameno = 0; !should_quit; ++frameno) {  // Ends when the clip ends.
+		for (int64_t frameno = 0; !should_quit; ++frameno) {  // Ends when the clip ends.
 			double out_pts = out_pts_origin + TIMEBASE * frameno / global_flags.output_framerate;
 			next_frame_start =
 				origin + microseconds(lrint((out_pts - out_pts_origin) * 1e6 / TIMEBASE));
@@ -195,6 +196,12 @@ void Player::play_playlist_once()
 				out_pts_origin = out_pts - TIMEBASE * frameno / global_flags.output_framerate;
 			}
 
+			if (should_skip_to_next.exchange(false)) {  // Test and clear.
+				Clip *clip = &clip_list[clip_idx].clip;  // Get a non-const pointer.
+				fprintf(stderr, "pts_out moving to first of %ld and %ld (currently at %f)\n", clip->pts_out, lrint(out_pts + clip->fade_time_seconds * TIMEBASE), out_pts);
+				clip->pts_out = std::min(clip->pts_out, lrint(in_pts + clip->fade_time_seconds * clip->speed * TIMEBASE));
+			}
+
 			if (in_pts >= clip->pts_out) {
 				break;
 			}