X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=611f0abce4151ceff3a9adc8e51da2dc14e987b3;hb=e0cb348ca42ae7057f8f5acee92a23e7eb26075f;hp=fa094be98b3bfb715730ed4eab3d3b74e0255900;hpb=f78363119d05e83b2665d89b147945fc0cdec020;p=nageru

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index fa094be..611f0ab 100644
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -35,7 +35,7 @@ void Player::thread_func(AVFormatContext *file_avctx)
 	QOpenGLContext *context = create_context(surface);
 	if (!make_current(context, surface)) {
 		printf("oops\n");
-		exit(1);
+		abort();
 	}
 
 	check_error();
@@ -198,8 +198,7 @@ void Player::play_playlist_once()
 
 			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));
+				clip->pts_out = std::min<int64_t>(clip->pts_out, llrint(in_pts + clip->fade_time_seconds * clip->speed * TIMEBASE));
 			}
 
 			if (in_pts >= clip->pts_out) {
@@ -340,7 +339,7 @@ void Player::play_playlist_once()
 				ss.imbue(locale("C"));
 				ss.precision(3);
 				ss << "Futatabi " NAGERU_VERSION ";PLAYING;";
-				ss << fixed << time_remaining.t;
+				ss << fixed << (time_remaining.num_infinite * 86400.0 + time_remaining.t);
 				ss << ";" << format_duration(time_remaining) << " left";
 				subtitle = ss.str();
 			}