diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2023-07-04 23:57:46 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2023-07-11 15:19:13 +0100 |
| commit | 5ca0c9276f284c91bd4779725a150ed2828c9e60 (patch) | |
| tree | d6aa98f7a1ab029eac8f15e856552faa161b3b7f /include | |
| parent | bff6d952816ba0d516785eb57953285a5b324370 (diff) | |
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 <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libcamera/camera_manager.h | 1 | ||||
| -rw-r--r-- | include/libcamera/internal/camera_manager.h | 3 |
2 files changed, 1 insertions, 3 deletions
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<std::shared_ptr<Camera>> cameras() const; std::shared_ptr<Camera> get(const std::string &id); - std::shared_ptr<Camera> 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<std::shared_ptr<Camera>> cameras_ LIBCAMERA_TSA_GUARDED_BY(mutex_); - std::map<dev_t, std::weak_ptr<Camera>> camerasByDevnum_ LIBCAMERA_TSA_GUARDED_BY(mutex_); ConditionVariable cv_; bool initialized_ LIBCAMERA_TSA_GUARDED_BY(mutex_); |