{"id":21218,"url":"https://patchwork.libcamera.org/api/1.1/patches/21218/?format=json","web_url":"https://patchwork.libcamera.org/patch/21218/","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":"<20240910180729.2096985-3-paul.elder@ideasonboard.com>","date":"2024-09-10T18:07:29","name":"[2/2] apps: cam: Print control enum values more nicely","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"ad9bef41f20fd8a11a2e33d436c8b44bb79d2f9e","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21218/mbox/","series":[{"id":4575,"url":"https://patchwork.libcamera.org/api/1.1/series/4575/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4575","date":"2024-09-10T18:07:27","name":"libcamera: controls: Add enum information to","version":1,"mbox":"https://patchwork.libcamera.org/series/4575/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21218/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21218/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 98481C324C\n\tfor ;\n\tTue, 10 Sep 2024 18:07:52 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2476D63501;\n\tTue, 10 Sep 2024 20:07:48 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 57A58634F8\n\tfor ;\n\tTue, 10 Sep 2024 20:07:43 +0200 (CEST)","from pyrite.hamster-moth.ts.net\n\t(213-229-8-243.static.upcbusiness.at [213.229.8.243])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3F6F91920;\n\tTue, 10 Sep 2024 20:06:26 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"MuiK6QIh\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1725991586;\n\tbh=Dl9F/Kph6lZE3WX7bi4SdDUqhda3P9BaEBW1002z5ac=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MuiK6QIhL/0l+iikglditQPv4VqVKGhxalPOoDIx4OvfAqf78IolCyNfuY0Z/j5V5\n\txxkNsVzogWp1wfuawTpqOETdUv1/bB9iKM0dfQDAJpNmd0+3kJ/f4T7lq34IVVWY4N\n\tYm+35OlSUpvFp5U6VnfoXI5Rm1eZPpHqGX+Rc05o=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder ,\n\tstefan.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","Content-Transfer-Encoding":"8bit","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that enum names can be obtained from ControlId, use that information\nto print out the list of supported enum values in --list-controls.\n\nSigned-off-by: Paul Elder \n---\n src/apps/cam/camera_session.cpp | 12 ++++++++++--\n 1 file changed, 10 insertions(+), 2 deletions(-)","diff":"diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\nindex 097dc4792..964f2e8c3 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -159,8 +159,16 @@ CameraSession::~CameraSession()\n void CameraSession::listControls() const\n {\n \tfor (const auto &[id, info] : camera_->controls()) {\n-\t\tstd::cout << \"Control: \" << id->name() << \": \"\n-\t\t\t << info.toString() << std::endl;\n+\t\tif (info.values().size() == 0) {\n+\t\t\tstd::cout << \"Control: \" << id->name() << \": \"\n+\t\t\t\t << info.toString() << std::endl;\n+\t\t} else {\n+\t\t\tstd::cout << \"Control: \" << id->name() << \": \" << std::endl;\n+\t\t\tfor (const auto &value : info.values()) {\n+\t\t\t\tint32_t val = value.get();\n+\t\t\t\tstd::cout << \" - \" << id->enumName(val) << \" (\" << val << \")\" << std::endl;\n+\t\t\t}\n+\t\t}\n \t}\n }\n \n","prefixes":["2/2"]}