{"id":8854,"url":"https://patchwork.libcamera.org/api/1.1/patches/8854/?format=json","web_url":"https://patchwork.libcamera.org/patch/8854/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200718132324.867815-6-niklas.soderlund@ragnatech.se>","date":"2020-07-18T13:23:20","name":"[libcamera-devel,5/9] libcamera: camera_manager: Try to match camera IDs first","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b5ee7e93efa97c7f939033ed41d6e85b2d2880e3","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":{"id":16,"url":"https://patchwork.libcamera.org/api/1.1/users/16/?format=json","username":"neg","first_name":"Niklas","last_name":"Söderlund","email":"niklas.soderlund@ragnatech.se"},"mbox":"https://patchwork.libcamera.org/patch/8854/mbox/","series":[{"id":1115,"url":"https://patchwork.libcamera.org/api/1.1/series/1115/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1115","date":"2020-07-18T13:23:15","name":"libcamera: camera: Add camera ID","version":1,"mbox":"https://patchwork.libcamera.org/series/1115/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8854/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8854/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 30CE4C0109\n\tfor ;\n\tSat, 18 Jul 2020 13:23:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0D9806073E;\n\tSat, 18 Jul 2020 15:23:37 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 87FA0605C3\n\tfor ;\n\tSat, 18 Jul 2020 15:23:34 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid e06a023b-c8f9-11ea-933e-005056917a89;\n\tSat, 18 Jul 2020 15:23:32 +0200 (CEST)"],"X-Halon-ID":"e06a023b-c8f9-11ea-933e-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 18 Jul 2020 15:23:20 +0200","Message-Id":"<20200718132324.867815-6-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200718132324.867815-1-niklas.soderlund@ragnatech.se>","References":"<20200718132324.867815-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 5/9] libcamera: camera_manager: Try to\n\tmatch camera IDs first","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"When getting a camera from a string match on camera ID before name.\n\nSigned-off-by: Niklas Söderlund \n---\n src/libcamera/camera_manager.cpp | 6 ++++++\n 1 file changed, 6 insertions(+)","diff":"diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 4d23d601e1fc8a28..796b84b5bb00bed4 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -346,6 +346,12 @@ std::shared_ptr CameraManager::get(const std::string &name)\n {\n \tMutexLocker locker(p_->mutex_);\n \n+\t/* Search camera IDs first. */\n+\tfor (std::shared_ptr camera : p_->cameras_) {\n+\t\tif (camera->id() == name)\n+\t\t\treturn camera;\n+\t}\n+\n \tfor (std::shared_ptr camera : p_->cameras_) {\n \t\tif (camera->name() == name)\n \t\t\treturn camera;\n","prefixes":["libcamera-devel","5/9"]}