From 796adbe28e3c28547947eebf575dd55af5d7dcf2 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Mon, 7 Aug 2023 10:42:03 +0200 Subject: libcamera: device_enumerator: Prepare for more device types Modify the existing device_enumerator implementation and documentation to prepare to support enumeration and matching of more device types than MediaDevice instances. Move all media device related types and function to use the "mediaDevice" name in place of a more generic "device" and modify the derived sysfs and udev based derived classes accordingly. Signed-off-by: Jacopo Mondi --- include/libcamera/internal/device_enumerator.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h index 2afb9fa0..8df6a3e2 100644 --- a/include/libcamera/internal/device_enumerator.h +++ b/include/libcamera/internal/device_enumerator.h @@ -34,12 +34,12 @@ public: Signal<> devicesAdded; protected: - std::unique_ptr createDevice(const std::string &deviceNode); - void addDevice(std::unique_ptr media); - void removeDevice(const std::string &deviceNode); + std::unique_ptr createMediaDevice(const std::string &deviceNode); + void addMediaDevice(std::unique_ptr media); + void removeMediaDevice(const std::string &deviceNode); private: - std::vector> devices_; + std::vector> mediaDevices_; }; } /* namespace libcamera */ -- cgit v1.2.1