When starting a new clip, start at the correct master speed (it was always at 100%).

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 442144918559bebe00c106f4d705e4592875b525..910377a8236fb3a323bdc1b4559328b50725e5fe 100644 (file)
--- 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 b912b8c2ef2ab9b7117ed152f5bd8589be9eefad..597f70209373ae601c6b7d6401d3e53ffb8f88e1 100644 (file)
--- 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<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;