From patchwork Mon Sep 21 03:10:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9677 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 33490BF01C for ; Mon, 21 Sep 2020 03:11:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3219E62FAE; Mon, 21 Sep 2020 05:11:37 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="OV0+Coa/"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4AC9362FAC for ; Mon, 21 Sep 2020 05:11:34 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D537027B for ; Mon, 21 Sep 2020 05:11:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1600657894; bh=CJXFFwYMbLRkvxmm3Vzks8qplmPsS31TgHEJ+x2jlPU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OV0+Coa/XjEKyBdFvul/zmxGd3hGdFafLKf8MUz34AwY1FtIv3LQDBLH1eopavsHs WJw8cx78yCBBYbEm8xdkpikl5iwzRnV2Lt+5964nmQHKwy6smh0Kf+jtzLUPcg37g1 i2sQWLH2Qz9xq3nSTu0hnjVE7LK7dZeQF1kO1I3g= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Mon, 21 Sep 2020 06:10:55 +0300 Message-Id: <20200921031057.3564-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200921031057.3564-1-laurent.pinchart@ideasonboard.com> References: <20200921031057.3564-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/4] libcamera: camera_manager: Make CameraManager::Private::mutex_ mutable X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The mutex_ stored in the CameraManager::Private class is used to protect members that may need to be accessed from const functions. Make it mutable to allow this. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- src/libcamera/camera_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 47d56256abd6..780a66a7ac10 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -46,7 +46,7 @@ public: * - initialized_ and status_ during initialization * - cameras_ and camerasByDevnum_ after initialization */ - Mutex mutex_; + mutable Mutex mutex_; std::vector> cameras_; std::map> camerasByDevnum_;