{"id":362,"url":"https://patchwork.libcamera.org/api/1.1/patches/362/?format=json","web_url":"https://patchwork.libcamera.org/patch/362/","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":"<20190124101651.9993-8-laurent.pinchart@ideasonboard.com>","date":"2019-01-24T10:16:48","name":"[libcamera-devel,07/10] libcamera: camera_manager: Add method to unregister a camera","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"8a457c30f483c297a75757517ea95299f9813304","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/362/mbox/","series":[{"id":125,"url":"https://patchwork.libcamera.org/api/1.1/series/125/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=125","date":"2019-01-24T10:16:41","name":"Hotplug support and object lifetime management","version":1,"mbox":"https://patchwork.libcamera.org/series/125/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/362/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/362/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6ADC660C80\n\tfor ;\n\tThu, 24 Jan 2019 11:16:59 +0100 (CET)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 01E4723A;\n\tThu, 24 Jan 2019 11:16:58 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548325019;\n\tbh=L6Pj4vgVp1yJwUojTA335EVrDk1aMDHwLJvuo0r7JQk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=qT8cygdgIbS4xGjJUEkkeAG49W7qD+wh0tMHtCo30nPE4wuEvnzZhInSGcp9gG3eZ\n\t5vdlJhx4UWDlSEdghBqNGqJW+yfNnL82cuhsd361vpPwGZXgBkUDZ6FSfFOsbl28vR\n\tRwM6S2y4qvDAv2VwJjZ7J/98oo2akEdAvioCM4P4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 24 Jan 2019 12:16:48 +0200","Message-Id":"<20190124101651.9993-8-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190124101651.9993-1-laurent.pinchart@ideasonboard.com>","References":"<20190124101651.9993-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 07/10] libcamera: camera_manager: Add\n\tmethod to unregister a camera","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 24 Jan 2019 10:17:00 -0000"},"content":"The new removeCamera() method is meant to be used by pipeline handlers\nto unregister a camera in case of device disconnection.\n\nSigned-off-by: Laurent Pinchart \n---\n include/libcamera/camera_manager.h | 1 +\n src/libcamera/camera_manager.cpp | 21 +++++++++++++++++++++\n 2 files changed, 22 insertions(+)","diff":"diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h\nindex 45e72df0ef65..56dbd26f64db 100644\n--- a/include/libcamera/camera_manager.h\n+++ b/include/libcamera/camera_manager.h\n@@ -28,6 +28,7 @@ public:\n \tstd::shared_ptr get(const std::string &name);\n \n \tvoid addCamera(std::shared_ptr camera);\n+\tvoid removeCamera(Camera *camera);\n \n \tstatic CameraManager *instance();\n \ndiff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 3eccf20c4ce9..f90201ade18b 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -191,6 +191,27 @@ void CameraManager::addCamera(std::shared_ptr camera)\n \tcameras_.push_back(std::move(camera));\n }\n \n+/**\n+ * \\brief Remove a camera from the camera manager\n+ * \\param[in] camera The camera to be removed\n+ *\n+ * This function is called by pipeline handlers to unregister cameras from the\n+ * camera manager. Unregistered cameras won't be reported anymore by the\n+ * cameras() and get() calls, but references may still exist in applications.\n+ */\n+void CameraManager::removeCamera(Camera *camera)\n+{\n+\tfor (auto iter = cameras_.begin(); iter != cameras_.end(); ++iter) {\n+\t\tif (iter->get() == camera) {\n+\t\t\tLOG(Camera, Debug)\n+\t\t\t\t<< \"Unregistering camera '\"\n+\t\t\t\t<< camera->name() << \"'\";\n+\t\t\tcameras_.erase(iter);\n+\t\t\treturn;\n+\t\t}\n+\t}\n+}\n+\n /**\n * \\brief Retrieve the camera manager instance\n *\n","prefixes":["libcamera-devel","07/10"]}