X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.h;h=597f70209373ae601c6b7d6401d3e53ffb8f88e1;hb=bcd177e1daf5a63d7bf877bc5d30d8803dfd472c;hp=79ab64db4a1788430aa9658287db9621119b0001;hpb=5d52ea28eea891d2cd5b9485a1348ec7302df157;p=nageru

diff --git a/futatabi/player.h b/futatabi/player.h
index 79ab64d..597f702 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 {
@@ -68,6 +73,7 @@ public:
 
 	void set_master_speed(float speed)
 	{
+		start_master_speed = speed;
 		change_master_speed = speed;
 	}
 
@@ -79,7 +85,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.
@@ -89,7 +95,7 @@ public:
 private:
 	void thread_func(AVFormatContext *file_avctx);
 	void play_playlist_once();
-	void display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, std::chrono::steady_clock::time_point frame_start, bool snapped, const std::string &subtitle);
+	void display_single_frame(int primary_stream_idx, const FrameOnDisk &primary_frame, int secondary_stream_idx, const FrameOnDisk &secondary_frame, double fade_alpha, std::chrono::steady_clock::time_point frame_start, bool snapped, const std::string &subtitle, bool play_audio);
 	void open_output_stream();
 	static int write_packet2_thunk(void *opaque, uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
 	int write_packet2(uint8_t *buf, int buf_size, AVIODataMarkerType type, int64_t time);
@@ -101,6 +107,7 @@ private:
 	std::thread player_thread;
 	std::atomic<bool> should_quit{ false };
 	std::atomic<bool> should_skip_to_next{ false };
+	std::atomic<float> start_master_speed{ 1.0f };
 	std::atomic<float> change_master_speed{ 0.0f / 0.0f };
 
 	JPEGFrameView *destination;
@@ -141,13 +148,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)