X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=futatabi%2Fvideo_stream.cpp;h=7c2f8f90464c3af487c119bf8962830ae299b831;hp=dcf44f8e452fb9277e25bd08eafd681d0ed286b4;hb=b44bf7cfce6a5aaffbcd1e37df39068a163438ad;hpb=add8bb3a499cfeaad58bf5bdbda68391bab64059

diff --git a/futatabi/video_stream.cpp b/futatabi/video_stream.cpp
index dcf44f8..7c2f8f9 100644
--- a/futatabi/video_stream.cpp
+++ b/futatabi/video_stream.cpp
@@ -282,7 +282,7 @@ void VideoStream::clear_queue()
 	deque<QueuedFrame> q;
 
 	{
-		unique_lock<mutex> lock(queue_lock);
+		lock_guard<mutex> lock(queue_lock);
 		q = move(frame_queue);
 	}
 
@@ -323,7 +323,7 @@ void VideoStream::schedule_original_frame(steady_clock::time_point local_pts,
 	qf.display_func = move(display_func);
 	qf.queue_spot_holder = move(queue_spot_holder);
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }
@@ -342,7 +342,7 @@ void VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64
 	// separate pools around.)
 	BorrowedInterpolatedFrameResources resources;
 	{
-		unique_lock<mutex> lock(queue_lock);
+		lock_guard<mutex> lock(queue_lock);
 		if (interpolate_resources.empty()) {
 			fprintf(stderr, "WARNING: Too many interpolated frames already in transit; dropping one.\n");
 			return;
@@ -391,7 +391,7 @@ void VideoStream::schedule_faded_frame(steady_clock::time_point local_pts, int64
 	qf.resources = move(resources);
 	qf.local_pts = local_pts;
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }
@@ -411,7 +411,7 @@ void VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts
 	// Get the temporary OpenGL resources we need for doing the interpolation.
 	BorrowedInterpolatedFrameResources resources;
 	{
-		unique_lock<mutex> lock(queue_lock);
+		lock_guard<mutex> lock(queue_lock);
 		if (interpolate_resources.empty()) {
 			fprintf(stderr, "WARNING: Too many interpolated frames already in transit; dropping one.\n");
 			return;
@@ -517,7 +517,7 @@ void VideoStream::schedule_interpolated_frame(steady_clock::time_point local_pts
 	check_error();
 	qf.resources = move(resources);
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }
@@ -532,7 +532,7 @@ void VideoStream::schedule_refresh_frame(steady_clock::time_point local_pts,
 	qf.display_func = move(display_func);
 	qf.queue_spot_holder = move(queue_spot_holder);
 
-	unique_lock<mutex> lock(queue_lock);
+	lock_guard<mutex> lock(queue_lock);
 	frame_queue.push_back(move(qf));
 	queue_changed.notify_all();
 }