From patchwork Wed Jul 7 02:19:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12838 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 CB381BD794 for ; Wed, 7 Jul 2021 02:20:55 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7F9F168506; Wed, 7 Jul 2021 04:20:55 +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="qwOJ77vK"; 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 F333668510 for ; Wed, 7 Jul 2021 04:20:40 +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 8E75A466 for ; Wed, 7 Jul 2021 04:20:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1625624440; bh=RPi1pVmUr/YuYSiysQqbAJoBNcqSZyIOESMQetdHMRU=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qwOJ77vKjdri9unEVA0bdk1vberQ70/BNQon+W632v/BlO5X40UF648wwp6UUcGmW MU5bx1AsZ1GC1iHiTWAR0IsvjQIoTiDgyFCx0e3v+dO8p73DLAF1fmSUhFKb0hKzyr g73z35cGz6ZUPCL9SEYBxSHC2evZAn0Nl4NMNpJc= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Wed, 7 Jul 2021 05:19:36 +0300 Message-Id: <20210707021941.20804-26-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210707021941.20804-1-laurent.pinchart@ideasonboard.com> References: <20210707021941.20804-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 25/30] cam: Move session_ member variable to a local variable in run() function 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 session_ member of the CamApp class is only needed in the run() function. Make it a local variable. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/main.cpp | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 4fe0c4c368d1..380c14e02cf0 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -47,7 +47,6 @@ private: OptionsParser::Options options_; std::unique_ptr cm_; - std::unique_ptr session_; EventLoop loop_; }; @@ -86,8 +85,6 @@ int CamApp::init(int argc, char **argv) void CamApp::cleanup() { - session_.reset(); - cm_->stop(); } @@ -172,6 +169,7 @@ void CamApp::captureDone() int CamApp::run() { + std::unique_ptr session; int ret; if (options_.isSet(OptList)) { @@ -185,55 +183,55 @@ int CamApp::run() } if (options_.isSet(OptCamera)) { - session_ = std::make_unique(cm_.get(), options_); - if (!session_->isValid()) { + session = std::make_unique(cm_.get(), options_); + if (!session->isValid()) { std::cout << "Failed to create camera session" << std::endl; return -EINVAL; } - std::cout << "Using camera " << session_->camera()->id() + std::cout << "Using camera " << session->camera()->id() << std::endl; - session_->captureDone.connect(this, &CamApp::captureDone); + session->captureDone.connect(this, &CamApp::captureDone); } if (options_.isSet(OptListControls)) { - if (!session_) { + if (!session) { std::cout << "Cannot list controls without a camera" << std::endl; return -EINVAL; } - session_->listControls(); + session->listControls(); } if (options_.isSet(OptListProperties)) { - if (!session_) { + if (!session) { std::cout << "Cannot list properties without a camera" << std::endl; return -EINVAL; } - session_->listProperties(); + session->listProperties(); } if (options_.isSet(OptInfo)) { - if (!session_) { + if (!session) { std::cout << "Cannot print stream information without a camera" << std::endl; return -EINVAL; } - session_->infoConfiguration(); + session->infoConfiguration(); } if (options_.isSet(OptCapture)) { - if (!session_) { + if (!session) { std::cout << "Can't capture without a camera" << std::endl; return -ENODEV; } - ret = session_->start(options_); + ret = session->start(options_); if (ret) { std::cout << "Failed to start camera session" << std::endl; return ret; @@ -241,7 +239,7 @@ int CamApp::run() loop_.exec(); - session_->stop(); + session->stop(); return 0; }