From patchwork Mon Oct 3 21:21:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 17515 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 27AC6C327C for ; Mon, 3 Oct 2022 21:21:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B829860A7B; Mon, 3 Oct 2022 23:21:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664832100; bh=jHUug7L17lPRLcPRGS03wEx6CP6ZMUfB7Em4rB37JqU=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=mTZA/r4bX1xjI/gT1/Hu6bJLf4zuXr3y1yDGqacpurjiDEIZdaogtOJQ5rFXDK6Ei oYxw/tZuz96j/VoGvtOtYFXCoErgCoDeZ3KXVjH8bSZF3Xn1Pfbj8XI9UEHsHFsH+T anKISYKZ7YgZjeWok8rPdIx2UttYajWnHUuF+fSYzhyAXOp99hAO6fryGWBepauv3T UbmtYhF4OGmVRsyxuOLN6opN7JNZ8pAjHTXxqM5lEwUVz7wBB9+FMzHiYRI2WVAmOy xFnBWjToiGee1mgtIk3ncyQ8somEvVJs5/C62GJRSzBN8VRdIL1me6+LuaSnzA/zrl s4KtkhP09T8RA== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 0172D60A76 for ; Mon, 3 Oct 2022 23:21:39 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="IuKQtgWz"; dkim-atps=neutral Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7F455440 for ; Mon, 3 Oct 2022 23:21:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664832098; bh=jHUug7L17lPRLcPRGS03wEx6CP6ZMUfB7Em4rB37JqU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=IuKQtgWzbzq2pq2BHhtAh2UwsIOZ99Xvbg+lTmaM6hVIFOGJdAicHRcq9TABjvk72 KXSyzirxBNaT1lQGFnOSSpcaWXR1mA4JCcv6800+aSipiJQCYcSDlOHic1YTd3q25W xFOTVAWaAfVQzAkePfjhzRj1jT5OexJimzJb/hgk= To: libcamera-devel@lists.libcamera.org Date: Tue, 4 Oct 2022 00:21:25 +0300 Message-Id: <20221003212128.32429-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221003212128.32429-1-laurent.pinchart@ideasonboard.com> References: <20221003212128.32429-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 5/8] libcamera: pipeline_handler: Make factory create() function const 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: , X-Patchwork-Original-From: Laurent Pinchart via libcamera-devel From: Laurent Pinchart Reply-To: Laurent Pinchart Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The PipelineHandlerFactory::create() function has no need to modify the factory instance. Make it const, as well as the createInstance() function. Signed-off-by: Laurent Pinchart Reviewed-by: Xavier Roumegue Reviewed-by: Jacopo Mondi --- include/libcamera/internal/pipeline_handler.h | 6 +++--- src/libcamera/pipeline_handler.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 20f1cbb07fea..46df69dc789a 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -104,7 +104,7 @@ public: PipelineHandlerFactory(const char *name); virtual ~PipelineHandlerFactory() = default; - std::shared_ptr create(CameraManager *manager); + std::shared_ptr create(CameraManager *manager) const; const std::string &name() const { return name_; } @@ -112,7 +112,7 @@ public: static std::vector &factories(); private: - virtual PipelineHandler *createInstance(CameraManager *manager) = 0; + virtual PipelineHandler *createInstance(CameraManager *manager) const = 0; std::string name_; }; @@ -124,7 +124,7 @@ public: \ handler##Factory() : PipelineHandlerFactory(#handler) {} \ \ private: \ - PipelineHandler *createInstance(CameraManager *manager) \ + PipelineHandler *createInstance(CameraManager *manager) const \ { \ return new handler(manager); \ } \ diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index e5cb751cc743..4470e9041e8e 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -676,7 +676,7 @@ PipelineHandlerFactory::PipelineHandlerFactory(const char *name) * \return A shared pointer to a new instance of the PipelineHandler subclass * corresponding to the factory */ -std::shared_ptr PipelineHandlerFactory::create(CameraManager *manager) +std::shared_ptr PipelineHandlerFactory::create(CameraManager *manager) const { PipelineHandler *handler = createInstance(manager); handler->name_ = name_.c_str(); @@ -719,7 +719,7 @@ std::vector &PipelineHandlerFactory::factories() } /** - * \fn PipelineHandlerFactory::createInstance() + * \fn PipelineHandlerFactory::createInstance() const * \brief Create an instance of the PipelineHandler corresponding to the factory * \param[in] manager The camera manager *