From patchwork Sat May 15 04:05:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12302 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com 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 74768C31F6 for ; Sat, 15 May 2021 04:05:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0918968919; Sat, 15 May 2021 06:05:32 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="UVO3X358"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 28FD168920 for ; Sat, 15 May 2021 06:05:27 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B43C36EE for ; Sat, 15 May 2021 06:05:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1621051526; bh=5kg12NqlBw/SExg63szd59FYREyrjhOUD19hARUxaoM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=UVO3X3581J0O82BlcpoIPnghuF02WIuC7OEGarOclqbZwZ3fv+8o2B6seSpykeZCn aORNtn8qfS5rPx4XoIlA6kHc/erNpf7ikMbjygKdJbhjds3J2Hodaz3LOa1glma159 ZaHvDBkBWvOOhTVI5tM/m3UDymcEFG5Eq9k3lF8U= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 15 May 2021 07:05:11 +0300 Message-Id: <20210515040511.23294-5-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.28.1 In-Reply-To: <20210515040511.23294-1-laurent.pinchart@ideasonboard.com> References: <20210515040511.23294-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/4] v4l2: Adapt to utils::enumerate() usage of named fields 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" This will be squashed with "v4l2: Replace manual loop counters with utils::enumerate()" if "libcamera: utils: enumerate: Use named fields for result" is accepted. Signed-off-by: Laurent Pinchart --- src/v4l2/v4l2_compat_manager.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 96dbcdf28f04..bf5bf8e3223d 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -83,8 +83,9 @@ int V4L2CompatManager::start() * created here to wrap a camera device. */ auto cameras = cm_->cameras(); - for (auto [index, camera] : utils::enumerate(cameras)) { - V4L2CameraProxy *proxy = new V4L2CameraProxy(index, camera); + for (const auto camera : utils::enumerate(cameras)) { + V4L2CameraProxy *proxy = new V4L2CameraProxy(camera.index, + camera.value); proxies_.emplace_back(proxy); } @@ -118,9 +119,9 @@ int V4L2CompatManager::getCameraIndex(int fd) return -1; auto cameras = cm_->cameras(); - for (auto [index, camera] : utils::enumerate(cameras)) { - if (camera == target) - return index; + for (const auto camera : utils::enumerate(cameras)) { + if (camera.value == target) + return camera.index; } return -1;