{"id":12993,"url":"https://patchwork.libcamera.org/api/1.1/patches/12993/?format=json","web_url":"https://patchwork.libcamera.org/patch/12993/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210715211459.19373-24-laurent.pinchart@ideasonboard.com>","date":"2021-07-15T21:14:49","name":"[libcamera-devel,v3,23/33] cam: Use std::unique_ptr<> to manage CameraManager","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e22d4026673f1f9b3f7ebd30db9ee9557f85f712","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12993/mbox/","series":[{"id":2242,"url":"https://patchwork.libcamera.org/api/1.1/series/2242/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2242","date":"2021-07-15T21:14:26","name":"Multi-camera support in the cam application","version":3,"mbox":"https://patchwork.libcamera.org/series/2242/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12993/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12993/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 03F85C3229\n\tfor ;\n\tThu, 15 Jul 2021 21:15:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 99A1E68575;\n\tThu, 15 Jul 2021 23:15:29 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 74E7C68560\n\tfor ;\n\tThu, 15 Jul 2021 23:15:12 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 08D3D340\n\tfor ;\n\tThu, 15 Jul 2021 23:15:11 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rtVTbLUs\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626383712;\n\tbh=bUtsSy4UE3H6V43iaM72VWdZ+Y8/Y9xnZbYxwPkH0K8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=rtVTbLUszaN7pP0DJnREMRssb7ybHaPRG+IEXZCBoOmn1V9ApQyPGmtxNVXcUss9z\n\t1Jmn7KtdzIPXcZL15hgpxh+HXh8wnYzdgpkQ4GZD4+EI92AKJz5JtxQ0mo8k2hmgoM\n\t3zZ3xMqiQBQRa9F2ewgH2iFDNe7yRGMFL33BDMUM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 16 Jul 2021 00:14:49 +0300","Message-Id":"<20210715211459.19373-24-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","In-Reply-To":"<20210715211459.19373-1-laurent.pinchart@ideasonboard.com>","References":"<20210715211459.19373-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 23/33] cam: Use std::unique_ptr<> to\n\tmanage CameraManager","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Store the CameraManager instance in a unique_ptr to simplify memory\nmanagement and avoid leaks.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/main.cpp | 13 +++----------\n 1 file changed, 3 insertions(+), 10 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 8ed5e841a1e9..2ef26353e712 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -25,7 +25,6 @@ class CamApp\n {\n public:\n \tCamApp();\n-\t~CamApp();\n \n \tstatic CamApp *instance();\n \n@@ -49,8 +48,8 @@ private:\n \n \tstatic CamApp *app_;\n \tOptionsParser::Options options_;\n-\tCameraManager *cm_;\n \n+\tstd::unique_ptr cm_;\n \tstd::unique_ptr session_;\n \n \tEventLoop loop_;\n@@ -59,16 +58,10 @@ private:\n CamApp *CamApp::app_ = nullptr;\n \n CamApp::CamApp()\n-\t: cm_(nullptr)\n {\n \tCamApp::app_ = this;\n }\n \n-CamApp::~CamApp()\n-{\n-\tdelete cm_;\n-}\n-\n CamApp *CamApp::instance()\n {\n \treturn CamApp::app_;\n@@ -82,7 +75,7 @@ int CamApp::init(int argc, char **argv)\n \tif (ret < 0)\n \t\treturn ret;\n \n-\tcm_ = new CameraManager();\n+\tcm_ = std::make_unique();\n \n \tret = cm_->start();\n \tif (ret) {\n@@ -92,7 +85,7 @@ int CamApp::init(int argc, char **argv)\n \t}\n \n \tif (options_.isSet(OptCamera)) {\n-\t\tsession_ = std::make_unique(cm_, options_);\n+\t\tsession_ = std::make_unique(cm_.get(), options_);\n \t\tif (!session_->isValid()) {\n \t\t\tstd::cout << \"Failed to create camera session\" << std::endl;\n \t\t\tcleanup();\n","prefixes":["libcamera-devel","v3","23/33"]}