Various fixes for 32-bit platforms.

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 586df48c470bf0ec4a8682df31da60334b2cdccc..687afd013f13033ddcfa3f1af161fa8bbf361286 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -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) {