From patchwork Tue Sep 10 18:07:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 21218 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 98481C324C for ; Tue, 10 Sep 2024 18:07:52 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2476D63501; Tue, 10 Sep 2024 20:07:48 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="MuiK6QIh"; 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 57A58634F8 for ; Tue, 10 Sep 2024 20:07:43 +0200 (CEST) Received: from pyrite.hamster-moth.ts.net (213-229-8-243.static.upcbusiness.at [213.229.8.243]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F6F91920; Tue, 10 Sep 2024 20:06:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1725991586; bh=Dl9F/Kph6lZE3WX7bi4SdDUqhda3P9BaEBW1002z5ac=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MuiK6QIhL/0l+iikglditQPv4VqVKGhxalPOoDIx4OvfAqf78IolCyNfuY0Z/j5V5 xxkNsVzogWp1wfuawTpqOETdUv1/bB9iKM0dfQDAJpNmd0+3kJ/f4T7lq34IVVWY4N Ym+35OlSUpvFp5U6VnfoXI5Rm1eZPpHqGX+Rc05o= From: Paul Elder To: libcamera-devel@lists.libcamera.org Cc: Paul Elder , stefan.klug@ideasonboard.com Subject: [PATCH 2/2] apps: cam: Print control enum values more nicely Date: Tue, 10 Sep 2024 20:07:29 +0200 Message-Id: <20240910180729.2096985-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240910180729.2096985-1-paul.elder@ideasonboard.com> References: <20240910180729.2096985-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 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" Now that enum names can be obtained from ControlId, use that information to print out the list of supported enum values in --list-controls. Signed-off-by: Paul Elder --- src/apps/cam/camera_session.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 097dc4792..964f2e8c3 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -159,8 +159,16 @@ CameraSession::~CameraSession() void CameraSession::listControls() const { for (const auto &[id, info] : camera_->controls()) { - std::cout << "Control: " << id->name() << ": " - << info.toString() << std::endl; + if (info.values().size() == 0) { + std::cout << "Control: " << id->name() << ": " + << info.toString() << std::endl; + } else { + std::cout << "Control: " << id->name() << ": " << std::endl; + for (const auto &value : info.values()) { + int32_t val = value.get(); + std::cout << " - " << id->enumName(val) << " (" << val << ")" << std::endl; + } + } } }