From patchwork Fri Jul 23 04:00:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 13093 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 061B6C322D for ; Fri, 23 Jul 2021 04:00:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C4CF8687B7; Fri, 23 Jul 2021 06:00:51 +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="EvXER4A7"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 52667687AF for ; Fri, 23 Jul 2021 06:00:45 +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 EC97F3F2 for ; Fri, 23 Jul 2021 06:00:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1627012845; bh=2dapEB1s8HjLGPfNSyHNQ4skTYwINAySQpEVV8WsSiM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=EvXER4A7Kjifz0F7sN11whkHaLMidGKbC3RJW32Z6mthuAzszOe95A2Q4oz2o2c5y nvrSau89QDWjX+SO+wtBxYu5rWzUzHf48R2L0d/TkQVk/nV5s8nGhRqYwKRwfm52g9 fasNFOzrQfM/NVVr+b24NQ/aS1csfqJqXYNgA8zI= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Fri, 23 Jul 2021 07:00:26 +0300 Message-Id: <20210723040036.32346-8-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210723040036.32346-1-laurent.pinchart@ideasonboard.com> References: <20210723040036.32346-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH 07/17] libcamera: camera: Make Camera::Private members private 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" To prepare for the Camera::Private structure being used by pipeline handlers, turn all its members to private. Members that are useful for pipeline handlers will be made public again, or will be exposed through accessor functions, on a case-by-case basis. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- include/libcamera/internal/camera.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h index 9ef5d8ae98a6..b60ed140356a 100644 --- a/include/libcamera/internal/camera.h +++ b/include/libcamera/internal/camera.h @@ -26,6 +26,11 @@ class Camera::Private : public Extensible::Private LIBCAMERA_DECLARE_PUBLIC(Camera) public: + Private(PipelineHandler *pipe, const std::string &id, + const std::set &streams); + ~Private(); + +private: enum State { CameraAvailable, CameraAcquired, @@ -34,10 +39,6 @@ public: CameraRunning, }; - Private(PipelineHandler *pipe, const std::string &id, - const std::set &streams); - ~Private(); - bool isRunning() const; int isAccessAllowed(State state, bool allowDisconnected = false, const char *from = __builtin_FUNCTION()) const; @@ -53,7 +54,6 @@ public: std::set streams_; std::set activeStreams_; -private: bool disconnected_; std::atomic state_; };