From 5ca0c9276f284c91bd4779725a150ed2828c9e60 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Tue, 4 Jul 2023 23:57:46 +0100 Subject: libcamera: CameraManager: Remove ::get(dev_t) The CameraManager::get(dev_t) implementation was provided only for the V4L2 Adaptation layer. This has now been replaced with the use of the public SystemDevices property. Remove the deprecated function entirely, along with the camerasByDevnum_ map which was only used to support this functionality. This is a clear (and intentional) breakage in both the API and ABI. Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/camera_manager.cpp | 42 ---------------------------------------- 1 file changed, 42 deletions(-) (limited to 'src') diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 7c65bb99..355f3ada 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -178,15 +178,9 @@ void CameraManager::Private::addCamera(std::shared_ptr camera) } } - auto devnums = camera->properties() - .get(properties::SystemDevices) - .value_or(Span{}); - cameras_.push_back(std::move(camera)); unsigned int index = cameras_.size() - 1; - for (dev_t devnum : devnums) - camerasByDevnum_[devnum] = cameras_[index]; /* Report the addition to the public signal */ CameraManager *const o = LIBCAMERA_O_PTR(); @@ -219,13 +213,6 @@ void CameraManager::Private::removeCamera(std::shared_ptr camera) LOG(Camera, Debug) << "Unregistering camera '" << camera->id() << "'"; - auto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(), - [camera](const std::pair> &p) { - return p.second.lock().get() == camera.get(); - }); - if (iter_d != camerasByDevnum_.end()) - camerasByDevnum_.erase(iter_d); - cameras_.erase(iter); /* Report the removal to the public signal */ @@ -366,35 +353,6 @@ std::shared_ptr CameraManager::get(const std::string &id) return nullptr; } -/** - * \brief Retrieve a camera based on device number - * \param[in] devnum Device number of camera to get - * - * This function is meant solely for the use of the V4L2 compatibility - * layer, to map device nodes to Camera instances. Applications shall - * not use it and shall instead retrieve cameras by name. - * - * Before calling this function the caller is responsible for ensuring that - * the camera manager is running. - * - * \context This function is \threadsafe. - * - * \return Shared pointer to Camera object, which is empty if the camera is - * not found - */ -std::shared_ptr CameraManager::get(dev_t devnum) -{ - Private *const d = _d(); - - MutexLocker locker(d->mutex_); - - auto iter = d->camerasByDevnum_.find(devnum); - if (iter == d->camerasByDevnum_.end()) - return nullptr; - - return iter->second.lock(); -} - /** * \var CameraManager::cameraAdded * \brief Notify of a new camera added to the system -- cgit v1.2.1