Tiny fix in variational_refinement.txt.

[nageru] / futatabi / player.h

diff --git a/futatabi/player.h b/futatabi/player.h
index e64abd79f7b834b0f6521829576da8e4ef8bc9f5..da5a4435da936778dbec3c606c39a312e45af953 100644 (file)
--- a/futatabi/player.h
+++ b/futatabi/player.h
@@ -20,6 +20,11 @@ class VideoStream;
 class QSurface;
 class QSurfaceFormat;
 
+struct TimeRemaining {
+       size_t num_infinite;
+       double t;
+};
+
 class Player : public QueueInterface {
 public:
        enum StreamOutput {
@@ -61,6 +66,11 @@ public:
                pause_status = status;
        }
 
+       void skip_to_next()
+       {
+               should_skip_to_next = true;
+       }
+
        void set_master_speed(float speed)
        {
                change_master_speed = speed;
@@ -74,7 +84,7 @@ public:
        // Not thread-safe to set concurrently with playing.
        // Will be called back from the player thread.
        // The keys in the given map are row members in the vector given to play().
-       using progress_callback_func = std::function<void(const std::map<uint64_t, double> &progress, double time_remaining)>;
+       using progress_callback_func = std::function<void(const std::map<uint64_t, double> &progress, TimeRemaining time_remaining)>;
        void set_progress_callback(progress_callback_func cb) { progress_callback = cb; }
 
        // QueueInterface.
@@ -95,6 +105,7 @@ private:
 
        std::thread player_thread;
        std::atomic<bool> should_quit{ false };
+       std::atomic<bool> should_skip_to_next{ false };
        std::atomic<float> change_master_speed{ 0.0f / 0.0f };
 
        JPEGFrameView *destination;
@@ -135,13 +146,13 @@ private:
        const StreamOutput stream_output;
 };
 
-double compute_time_left(const std::vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing);
+TimeRemaining compute_time_left(const std::vector<ClipWithID> &clips, size_t currently_playing_idx, double progress_currently_playing);
 
-static inline double compute_total_time(const std::vector<ClipWithID> &clips)
+static inline TimeRemaining compute_total_time(const std::vector<ClipWithID> &clips)
 {
        return compute_time_left(clips, 0, 0.0);
 }
 
-std::string format_duration(double t);
+std::string format_duration(TimeRemaining t);
 
 #endif  // !defined(_PLAYER_H)