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 --- include/libcamera/camera_manager.h | 1 - include/libcamera/internal/camera_manager.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'include') diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h index 9767acc4..1a891cac 100644 --- a/include/libcamera/camera_manager.h +++ b/include/libcamera/camera_manager.h @@ -32,7 +32,6 @@ public: std::vector> cameras() const; std::shared_ptr get(const std::string &id); - std::shared_ptr get(dev_t devnum); static const std::string &version() { return version_; } diff --git a/include/libcamera/internal/camera_manager.h b/include/libcamera/internal/camera_manager.h index e4f5aaf4..33ebe069 100644 --- a/include/libcamera/internal/camera_manager.h +++ b/include/libcamera/internal/camera_manager.h @@ -50,11 +50,10 @@ private: * This mutex protects * * - initialized_ and status_ during initialization - * - cameras_ and camerasByDevnum_ after initialization + * - cameras_ after initialization */ mutable Mutex mutex_; std::vector> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_); - std::map> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_); ConditionVariable cv_; bool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_); -- cgit v1.2.1