{"id":12988,"url":"https://patchwork.libcamera.org/api/patches/12988/?format=json","web_url":"https://patchwork.libcamera.org/patch/12988/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-18-laurent.pinchart@ideasonboard.com>","date":"2021-07-15T21:14:43","name":"[libcamera-devel,v3,17/33] cam: Move event loop exit from CameraSession to CamApp","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"2ea5b718f9b654897b741b93c7c58464bcb0abb3","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12988/mbox/","series":[{"id":2242,"url":"https://patchwork.libcamera.org/api/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/12988/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12988/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 D3C18C322B\n\tfor ;\n\tThu, 15 Jul 2021 21:15:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8C47968562;\n\tThu, 15 Jul 2021 23:15:22 +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 6D63868540\n\tfor ;\n\tThu, 15 Jul 2021 23:15:10 +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 07F7B56B\n\tfor ;\n\tThu, 15 Jul 2021 23:15:09 +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=\"iF+8PbMq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626383710;\n\tbh=x5CNEx1LWA6WLUjHoyC1GgwLFypYWI48h97ycgU2hCc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=iF+8PbMqXc321BOb4o1FlgOnRlFfLq4HmgUbISi+1hBN/pMVPLPoIvrdMKpesgPpg\n\txNX4o/My9Aa6vKUyoCQCE9FuVVHM51zCQBychDqeTXpfwa0wLndQFrfV3W3XyeHhGk\n\tstEoHXreYYRtkp25nyBbDOiJviIvb2dhJQlWZj6M=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 16 Jul 2021 00:14:43 +0300","Message-Id":"<20210715211459.19373-18-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 17/33] cam: Move event loop exit from\n\tCameraSession to CamApp","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":"Make exiting the event loop the responsibility of the application, not\nthe camera session, to prepare for support of multiple camera sessions.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \n---\n src/cam/camera_session.cpp | 2 +-\n src/cam/camera_session.h | 4 ++++\n src/cam/main.cpp | 7 +++++++\n 3 files changed, 12 insertions(+), 1 deletion(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex b26c7974056d..16c1c66a285a 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -232,7 +232,7 @@ void CameraSession::processRequest(Request *request)\n \n \tcaptureCount_++;\n \tif (captureLimit_ && captureCount_ >= captureLimit_) {\n-\t\tEventLoop::instance()->exit(0);\n+\t\tcaptureDone.emit();\n \t\treturn;\n \t}\n \ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 270ba3e929e7..2728d7607db2 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -11,6 +11,8 @@\n #include \n #include \n \n+#include \n+\n #include \n #include \n #include \n@@ -28,6 +30,8 @@ public:\n \n \tint run(const OptionsParser::Options &options);\n \n+\tlibcamera::Signal<> captureDone;\n+\n private:\n \tint capture(libcamera::FrameBufferAllocator *allocator);\n \ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex 90435206d386..a567a7cc7653 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -38,6 +38,7 @@ public:\n private:\n \tvoid cameraAdded(std::shared_ptr cam);\n \tvoid cameraRemoved(std::shared_ptr cam);\n+\tvoid captureDone();\n \tint parseOptions(int argc, char *argv[]);\n \tint prepareConfig();\n \tint listControls();\n@@ -330,6 +331,11 @@ void CamApp::cameraRemoved(std::shared_ptr cam)\n \tstd::cout << \"Camera Removed: \" << cam->id() << std::endl;\n }\n \n+void CamApp::captureDone()\n+{\n+\tEventLoop::instance()->exit(0);\n+}\n+\n int CamApp::run()\n {\n \tint ret;\n@@ -364,6 +370,7 @@ int CamApp::run()\n \n \tif (options_.isSet(OptCapture)) {\n \t\tCameraSession session(camera_, config_.get());\n+\t\tsession.captureDone.connect(this, &CamApp::captureDone);\n \t\treturn session.run(options_);\n \t}\n \n","prefixes":["libcamera-devel","v3","17/33"]}