{"id":2340,"url":"https://patchwork.libcamera.org/api/1.1/patches/2340/?format=json","web_url":"https://patchwork.libcamera.org/patch/2340/","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":"<20191120015506.362440-10-niklas.soderlund@ragnatech.se>","date":"2019-11-20T01:55:05","name":"[libcamera-devel,v2,09/10] cam: Store camera as shared pointer everywhere","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"87bcda1b0ed7b6ee1985edafbe4016ce1fb62080","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2340/mbox/","series":[{"id":572,"url":"https://patchwork.libcamera.org/api/1.1/series/572/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=572","date":"2019-11-20T01:54:56","name":"libcamera: Fixes found while working on new","version":2,"mbox":"https://patchwork.libcamera.org/series/572/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2340/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2340/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 433476139C\n\tfor ;\n\tWed, 20 Nov 2019 02:55:35 +0100 (CET)","from bismarck.berto.se (p54ac5865.dip0.t-ipconnect.de\n\t[84.172.88.101]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid d702a215-0b38-11ea-a00b-005056917a89;\n\tWed, 20 Nov 2019 02:55:34 +0100 (CET)"],"X-Halon-ID":"d702a215-0b38-11ea-a00b-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 20 Nov 2019 02:55:05 +0100","Message-Id":"<20191120015506.362440-10-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.24.0","In-Reply-To":"<20191120015506.362440-1-niklas.soderlund@ragnatech.se>","References":"<20191120015506.362440-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 09/10] cam: Store camera as shared\n\tpointer everywhere","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","X-List-Received-Date":"Wed, 20 Nov 2019 01:55:35 -0000"},"content":"Do not store the camera raw pointer in the capture class, this will\nprevent forwarding the shared pointer in the future.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \nReviewed-by: Kieran Bingham \n---\n src/cam/capture.cpp | 2 +-\n src/cam/capture.h | 4 ++--\n src/cam/main.cpp | 2 +-\n 3 files changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/src/cam/capture.cpp b/src/cam/capture.cpp\nindex 27332df1d55a5c2d..e665d819fb777a90 100644\n--- a/src/cam/capture.cpp\n+++ b/src/cam/capture.cpp\n@@ -16,7 +16,7 @@\n \n using namespace libcamera;\n \n-Capture::Capture(Camera *camera, CameraConfiguration *config)\n+Capture::Capture(std::shared_ptr camera, CameraConfiguration *config)\n \t: camera_(camera), config_(config), writer_(nullptr)\n {\n }\ndiff --git a/src/cam/capture.h b/src/cam/capture.h\nindex 4d396afb8c771a74..c692d48918f2de1d 100644\n--- a/src/cam/capture.h\n+++ b/src/cam/capture.h\n@@ -21,7 +21,7 @@\n class Capture\n {\n public:\n-\tCapture(libcamera::Camera *camera,\n+\tCapture(std::shared_ptr camera,\n \t\tlibcamera::CameraConfiguration *config);\n \n \tint run(EventLoop *loop, const OptionsParser::Options &options);\n@@ -30,7 +30,7 @@ private:\n \n \tvoid requestComplete(libcamera::Request *request);\n \n-\tlibcamera::Camera *camera_;\n+\tstd::shared_ptr camera_;\n \tlibcamera::CameraConfiguration *config_;\n \n \tstd::map streamName_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 9d99f5587cbb77d0..a38cca959aca05ff 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -319,7 +319,7 @@ int CamApp::run()\n \t}\n \n \tif (options_.isSet(OptCapture)) {\n-\t\tCapture capture(camera_.get(), config_.get());\n+\t\tCapture capture(camera_, config_.get());\n \t\treturn capture.run(loop_, options_);\n \t}\n \n","prefixes":["libcamera-devel","v2","09/10"]}