From add8bb3a499cfeaad58bf5bdbda68391bab64059 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 28 Dec 2018 00:31:45 +0100 Subject: [PATCH] Fix a minor unneeded unlock/lock. --- futatabi/player.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/futatabi/player.cpp b/futatabi/player.cpp index d75cdd2..b7ceb03 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -436,6 +436,8 @@ void Player::play(const vector &clips) void Player::override_angle(unsigned stream_idx) { + int64_t last_pts; + // Corner case: If a new clip is waiting to be played, change its stream and then we're done. { unique_lock lock(queue_state_mu); @@ -452,14 +454,10 @@ void Player::override_angle(unsigned stream_idx) new_clip_changed.notify_all(); return; } - } - // OK, so we're standing still, presumably at the end of a clip. - // Look at the last frame played (if it exists), and show the closest - // thing we've got. - int64_t last_pts; - { - lock_guard lock(queue_state_mu); + // OK, so we're standing still, presumably at the end of a clip. + // Look at the last frame played (if it exists), and show the closest + // thing we've got. if (last_pts_played < 0) { return; } -- 2.39.2