From patchwork Wed May 13 17:29:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 3790 X-Patchwork-Delegate: umang.jain@ideasonboard.com Return-Path: Received: from o1.f.az.sendgrid.net (o1.f.az.sendgrid.net [208.117.55.132]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3BB0360DFC for ; Wed, 13 May 2020 19:29:59 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=uajain.com header.i=@uajain.com header.b="rnhcsiEQ"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com; h=from:subject:in-reply-to:references:mime-version:to:cc: content-transfer-encoding:content-type; s=s1; bh=LDtxLbPplyDb22escqBemAmJKdBkt2XuDkj3m6ZFUBo=; b=rnhcsiEQMopSTbOtzxp3UmbJk8Tk6UIbnLKcMP8n0PUffrgeNad9NAwFnV7ajOZt6ZN+ nbGiVckSRtD9e7/nmenFM0QysIUPCX1lKr0kU19a3TYEK0XzyNf+s2lgdlWt41g9EjLfEI Onz1eWhYBN9H4POZEZKrr1Fzr9CjNZ1nA= Received: by filterdrecv-p3las1-cb48d7cc9-6ppgt with SMTP id filterdrecv-p3las1-cb48d7cc9-6ppgt-19-5EBC2E96-4 2020-05-13 17:29:58.430798336 +0000 UTC m=+4206148.422515078 Received: from mail.uajain.com (unknown) by ismtpd0008p1hnd1.sendgrid.net (SG) with ESMTP id UXtBw0nfQP-LDfU0mKMn6Q Wed, 13 May 2020 17:29:58.090 +0000 (UTC) From: Umang Jain Date: Wed, 13 May 2020 17:29:58 +0000 (UTC) Message-Id: <20200513172950.72685-3-email@uajain.com> In-Reply-To: <20200513172950.72685-1-email@uajain.com> References: <20200513172950.72685-1-email@uajain.com> Mime-Version: 1.0 X-SG-EID: 1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPclq38gSC/txiORZpK15NbTl7AhXvTDHCpy7PI7ewHqvpLN7lOwsSlZiy3BEDPP24epCBIsoYRSB9MsJoEnNgU1Ul4l1VtzvVcxrTgNs24778WyNEYrT6MZZ60YfTbHtMkxiMuF875F10o2ZOfn8woDj6WhB4DZj4z6J20gkBFtXZe8EEr2EHWf0eWpnM4TUXZ9F5j+XtJq7r5ToXH2RY/TQ== To: libcamera-devel Subject: [libcamera-devel] [PATCH v2 2/5] libcamera: device_enumerator: Emit a signal when a new device is hotplugged 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: , X-List-Received-Date: Wed, 13 May 2020 17:30:01 -0000 Emit a signal whenever is a new MediaDevice is added to the DeviceEnumerator. This will allow CameraManager to get notified about the new devices that have been hot-plugged. Signed-off-by: Umang Jain --- src/libcamera/camera_manager.cpp | 4 ++-- src/libcamera/device_enumerator.cpp | 12 ++++++++++++ src/libcamera/include/device_enumerator.h | 4 ++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 1579ad4..a13cfe1 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -154,12 +154,12 @@ void CameraManager::Private::enumerateDevices() } } - /* \todo register hot-plug callback here */ + enumerator_->newDevicesFound.connect(this, &Private::enumerateDevices); } void CameraManager::Private::cleanup() { - /* \todo unregister hot-plug callback here */ + enumerator_->newDevicesFound.disconnect(this, &Private::enumerateDevices); /* * Release all references to cameras and pipeline handlers to ensure diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index dd17e3e..0492a86 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -227,6 +227,15 @@ std::unique_ptr DeviceEnumerator::createDevice(const std::string &d return media; } +/** +* \brief Notify of new media devices being found +* +* This signal is emitted when the device enumerator finds new media devices in +* the system. It may be emitted for every newly detected device, or once for +* multiple of devices, at the discretion of the device enumerator. Not all +* device enumerator types may support dynamic detection of new devices. +*/ + /** * \brief Add a media device to the enumerator * \param[in] media media device instance to add @@ -242,6 +251,9 @@ void DeviceEnumerator::addDevice(std::unique_ptr &&media) << "Added device " << media->deviceNode() << ": " << media->driver(); devices_.push_back(std::move(media)); + + /* \todo: To batch multiple additions, emit with a small delay here. */ + newDevicesFound.emit(); } /** diff --git a/src/libcamera/include/device_enumerator.h b/src/libcamera/include/device_enumerator.h index 433e357..cd4e846 100644 --- a/src/libcamera/include/device_enumerator.h +++ b/src/libcamera/include/device_enumerator.h @@ -13,6 +13,8 @@ #include +#include + namespace libcamera { class MediaDevice; @@ -43,6 +45,8 @@ public: std::shared_ptr search(const DeviceMatch &dm); + Signal<> newDevicesFound; + protected: std::unique_ptr createDevice(const std::string &deviceNode); void addDevice(std::unique_ptr &&media);