[libcamera-devel,5/9] libcamera: camera_manager: Try to match camera IDs first
diff mbox series

Message ID 20200718132324.867815-6-niklas.soderlund@ragnatech.se
State Superseded
Delegated to: Niklas Söderlund
Headers show
Series
  • libcamera: camera: Add camera ID
Related show

Commit Message

Niklas Söderlund July 18, 2020, 1:23 p.m. UTC 
When getting a camera from a string match on camera ID before name.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 src/libcamera/camera_manager.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

Patch
diff mbox series 

diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 4d23d601e1fc8a28..796b84b5bb00bed4 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -346,6 +346,12 @@  std::shared_ptr<Camera> CameraManager::get(const std::string &name)
 {
 	MutexLocker locker(p_->mutex_);
 
+	/* Search camera IDs first. */
+	for (std::shared_ptr<Camera> camera : p_->cameras_) {
+		if (camera->id() == name)
+			return camera;
+	}
+
 	for (std::shared_ptr<Camera> camera : p_->cameras_) {
 		if (camera->name() == name)
 			return camera;