From c0c28a5a077f432c65077173610b9f0aa78dfef4 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Wed, 30 Oct 2019 19:46:14 +0100 Subject: [PATCH] When starting a new clip, start at the correct master speed (it was always at 100%). --- futatabi/player.cpp | 2 +- futatabi/player.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/futatabi/player.cpp b/futatabi/player.cpp index 4421449..910377a 100644 --- 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. { diff --git a/futatabi/player.h b/futatabi/player.h index b912b8c..597f702 100644 --- a/futatabi/player.h +++ b/futatabi/player.h @@ -73,6 +73,7 @@ public: void set_master_speed(float speed) { + start_master_speed = speed; change_master_speed = speed; } @@ -106,6 +107,7 @@ private: std::thread player_thread; std::atomic should_quit{ false }; std::atomic should_skip_to_next{ false }; + std::atomic start_master_speed{ 1.0f }; std::atomic change_master_speed{ 0.0f / 0.0f }; JPEGFrameView *destination; -- 2.39.2