X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=da5a4435da936778dbec3c606c39a312e45af953;hb=e0cb348ca42ae7057f8f5acee92a23e7eb26075f;hp=79ab64db4a1788430aa9658287db9621119b0001;hpb=5d52ea28eea891d2cd5b9485a1348ec7302df157;p=nageru diff --git a/futatabi/player.h b/futatabi/player.h index 79ab64d..da5a443 100644 --- 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 { @@ -79,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 &progress, double time_remaining)>; + using progress_callback_func = std::function &progress, TimeRemaining time_remaining)>; void set_progress_callback(progress_callback_func cb) { progress_callback = cb; } // QueueInterface. @@ -141,13 +146,13 @@ private: const StreamOutput stream_output; }; -double compute_time_left(const std::vector &clips, size_t currently_playing_idx, double progress_currently_playing); +TimeRemaining compute_time_left(const std::vector &clips, size_t currently_playing_idx, double progress_currently_playing); -static inline double compute_total_time(const std::vector &clips) +static inline TimeRemaining compute_total_time(const std::vector &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)