From patchwork Sat Jul 18 13:23:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 8854 X-Patchwork-Delegate: niklas.soderlund@ragnatech.se Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 30CE4C0109 for ; Sat, 18 Jul 2020 13:23:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0D9806073E; Sat, 18 Jul 2020 15:23:37 +0200 (CEST) Received: from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net [195.74.38.229]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 87FA0605C3 for ; Sat, 18 Jul 2020 15:23:34 +0200 (CEST) X-Halon-ID: e06a023b-c8f9-11ea-933e-005056917a89 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de [79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA id e06a023b-c8f9-11ea-933e-005056917a89; Sat, 18 Jul 2020 15:23:32 +0200 (CEST) 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 match camera IDs first X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" When getting a camera from a string match on camera ID before name. Signed-off-by: Niklas Söderlund --- src/libcamera/camera_manager.cpp | 6 ++++++ 1 file changed, 6 insertions(+) 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 CameraManager::get(const std::string &name) { MutexLocker locker(p_->mutex_); + /* Search camera IDs first. */ + for (std::shared_ptr camera : p_->cameras_) { + if (camera->id() == name) + return camera; + } + for (std::shared_ptr camera : p_->cameras_) { if (camera->name() == name) return camera;