Fix the previous fix for the infinite display; it was causing crashes and odd stuff...

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 442144918559bebe00c106f4d705e4592875b525..f427d0566d1fd2c9eb24c6556adb32aeb5375362 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -114,7 +114,7 @@ void Player::play_playlist_once()
        bool clip_ready;
        steady_clock::time_point before_sleep = steady_clock::now();
        string pause_status;
-       float master_speed = 1.0f;
+       float master_speed = start_master_speed;
 
        // Wait until we're supposed to play something.
        {
@@ -628,7 +628,7 @@ TimeRemaining compute_time_left(const vector<ClipWithID> &clips, size_t currentl
        for (size_t row = currently_playing_idx; row < clips.size(); ++row) {
                const Clip &clip = clips[row].clip;
                double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / clip.speed;
-               if (clip_length >= 86400.0) {  // More than one day.
+               if (clip_length >= 86400.0 || clip.pts_out == -1) {  // More than one day.
                        ++remaining.num_infinite;
                } else {
                        if (row == currently_playing_idx) {