Factor out estimated time left calculation into its own function.

diff --git a/futatabi/mainwindow.cpp b/futatabi/mainwindow.cpp
index 968493365e563e7baa19b095d51df45876d42577..7455cacb31233bbe81b0bcfed50967092e23f5d0 100644 (file)
--- a/futatabi/mainwindow.cpp
+++ b/futatabi/mainwindow.cpp
@@ -418,25 +418,11 @@ void MainWindow::live_player_clip_progress(const map<size_t, double> &progress)
 {
        playlist_clips->set_progress(progress);
 
-       // Look at the last clip and then start counting from there.
-       assert(!progress.empty());
-       auto last_it = progress.end();
-       --last_it;
-       double remaining = 0.0;
-       double last_fade_time_seconds = 0.0;
-       for (size_t row = last_it->first; row < playlist_clips->size(); ++row) {
-               const Clip clip = *playlist_clips->clip(row);
-               double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / 0.5;  // FIXME: stop hardcoding speed.
-               if (row == last_it->first) {
-                       // A clip we're playing: Subtract the part we've already played.
-                       remaining = clip_length * (1.0 - last_it->second);
-               } else {
-                       // A clip we haven't played yet: Subtract the part that's overlapping
-                       // with a previous clip (due to fade).
-                       remaining += max(clip_length - last_fade_time_seconds, 0.0);
-               }
-               last_fade_time_seconds = min(clip_length, clip.fade_time_seconds);
+       vector<Clip> clips;
+       for (size_t row = 0; row < playlist_clips->size(); ++row) {
+               clips.push_back(*playlist_clips->clip(row));
        }
+       double remaining = compute_time_left(clips, progress);
        set_output_status(format_duration(remaining) + " left");
 }
 

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 2fb3939ec65d4f7c09276494845ab1abe51fe2ae..e5562f7f307e21fcfa7c288425a3f440bc62a74d 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -472,3 +472,27 @@ void Player::release_queue_spot()
        --num_queued_frames;
        new_clip_changed.notify_all();
 }
+
+double compute_time_left(const vector<Clip> &clips, const map<size_t, double> &progress)
+{
+       // Look at the last clip and then start counting from there.
+       assert(!progress.empty());
+       auto last_it = progress.end();
+       --last_it;
+       double remaining = 0.0;
+       double last_fade_time_seconds = 0.0;
+       for (size_t row = last_it->first; row < clips.size(); ++row) {
+               const Clip &clip = clips[row];
+               double clip_length = double(clip.pts_out - clip.pts_in) / TIMEBASE / 0.5;  // FIXME: stop hardcoding speed.
+               if (row == last_it->first) {
+                       // A clip we're playing: Subtract the part we've already played.
+                       remaining = clip_length * (1.0 - last_it->second);
+               } else {
+                       // A clip we haven't played yet: Subtract the part that's overlapping
+                       // with a previous clip (due to fade).
+                       remaining += max(clip_length - last_fade_time_seconds, 0.0);
+               }
+               last_fade_time_seconds = min(clip_length, clip.fade_time_seconds);
+       }
+       return remaining;
+}

diff --git a/futatabi/player.h b/futatabi/player.h
index 03da29e364b80db3c2a503fc3e3d98b25ee90a84..22de0b396cd98be13d0f3dba1049882f616e24a4 100644 (file)
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -20,6 +20,8 @@ class VideoStream;
 class QSurface;
 class QSurfaceFormat;
 
+double compute_time_left(const std::vector<Clip> &clips, const std::map<size_t, double> &progress);
+
 class Player : public QueueInterface {
 public:
        enum StreamOutput {