Fix a minor unneeded unlock/lock.

[nageru] / futatabi / player.cpp

diff --git a/futatabi/player.cpp b/futatabi/player.cpp
index 7c38821c395d55a7fd25dc1ed70a182b0f73c01e..b7ceb0359968567d9bdc36ef69966768281a5f27 100644 (file)
--- a/futatabi/player.cpp
+++ b/futatabi/player.cpp
@@ -427,17 +427,17 @@ Player::~Player()
 
 void Player::play(const vector<Clip> &clips)
 {
-       {
-               lock_guard<mutex> lock(queue_state_mu);
-               new_clip_ready = true;
-               queued_clip_list = clips;
-               override_stream_idx = -1;
-               new_clip_changed.notify_all();
-       }
+       lock_guard<mutex> lock(queue_state_mu);
+       new_clip_ready = true;
+       queued_clip_list = clips;
+       override_stream_idx = -1;
+       new_clip_changed.notify_all();
 }
 
 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<mutex> lock(queue_state_mu);
@@ -454,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<mutex> 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;
                }