X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fplayer.cpp;h=b871fa1f3c62ac4176b2c0138c312749410fda7d;hb=b44bf7cfce6a5aaffbcd1e37df39068a163438ad;hp=b7ceb0359968567d9bdc36ef69966768281a5f27;hpb=add8bb3a499cfeaad58bf5bdbda68391bab64059;p=nageru diff --git a/futatabi/player.cpp b/futatabi/player.cpp index b7ceb03..b871fa1 100644 --- a/futatabi/player.cpp +++ b/futatabi/player.cpp @@ -440,7 +440,7 @@ void Player::override_angle(unsigned stream_idx) // 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); + lock_guard lock(queue_state_mu); if (new_clip_ready) { assert(queued_clip_list.size() == 1); queued_clip_list[0].stream_idx = stream_idx; @@ -474,13 +474,13 @@ void Player::override_angle(unsigned stream_idx) void Player::take_queue_spot() { - unique_lock lock(queue_state_mu); + lock_guard lock(queue_state_mu); ++num_queued_frames; } void Player::release_queue_spot() { - unique_lock lock(queue_state_mu); + lock_guard lock(queue_state_mu); assert(num_queued_frames > 0); --num_queued_frames; new_clip_changed.notify_all();