From 3536473e06f9abe5027b25db3b97900bf474bccf Mon Sep 17 00:00:00 2001
From: Hirokazu Honda <hiroh@chromium.org>
Date: Wed, 1 Dec 2021 16:53:38 +0900
Subject: android: Consolidate mutex classes to Mutex and MutexLocker

std::mutex and std::unique_lock are used in android directories,
mixing Mutex and MutexLocker. This consolidates them to Mutex
and MutexLocker.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_stream.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/android/camera_stream.h')

diff --git a/src/android/camera_stream.h b/src/android/camera_stream.h
index e4808369..adb5a37d 100644
--- a/src/android/camera_stream.h
+++ b/src/android/camera_stream.h
@@ -8,7 +8,6 @@
 #pragma once
 
 #include <memory>
-#include <mutex>
 #include <queue>
 #include <vector>
 
@@ -173,7 +172,7 @@ private:
 	 * The class has to be MoveConstructible as instances are stored in
 	 * an std::vector in CameraDevice.
 	 */
-	std::unique_ptr<std::mutex> mutex_;
+	std::unique_ptr<libcamera::Mutex> mutex_;
 	std::unique_ptr<PostProcessor> postProcessor_;
 
 	std::unique_ptr<PostProcessorWorker> worker_;
-- 
cgit v1.2.1