{"id":9257,"url":"https://patchwork.libcamera.org/api/1.1/patches/9257/?format=json","web_url":"https://patchwork.libcamera.org/patch/9257/","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":"<20200806130937.2991606-7-niklas.soderlund@ragnatech.se>","date":"2020-08-06T13:09:36","name":"[libcamera-devel,6/7] cam: Print user-friendly camera names","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"700b48232f311e1d751e20ad1f892a057a72c432","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":null,"mbox":"https://patchwork.libcamera.org/patch/9257/mbox/","series":[{"id":1205,"url":"https://patchwork.libcamera.org/api/1.1/series/1205/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1205","date":"2020-08-06T13:09:30","name":"libcamera: Allow for user-friendly names in applications","version":1,"mbox":"https://patchwork.libcamera.org/series/1205/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9257/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9257/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 EABC3BD87A\n\tfor ;\n\tThu, 6 Aug 2020 13:09:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BCBB66071B;\n\tThu, 6 Aug 2020 15:09:51 +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 71F9260CBE\n\tfor ;\n\tThu, 6 Aug 2020 15:09:49 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-03.atm.binero.net (Halon) with ESMTPA\n\tid 18c9ae47-d7e6-11ea-b48b-0050569116f7;\n\tThu, 06 Aug 2020 15:09:45 +0200 (CEST)"],"X-Halon-ID":"18c9ae47-d7e6-11ea-b48b-0050569116f7","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 6 Aug 2020 15:09:36 +0200","Message-Id":"<20200806130937.2991606-7-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200806130937.2991606-1-niklas.soderlund@ragnatech.se>","References":"<20200806130937.2991606-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 6/7] cam: Print user-friendly camera names","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":"Instead of only printing the camera ID which is not intended for humans\nto read and parse create a more user friendly string when prating camera\nnames. The ID is still printed as it is one option used to select camera\nusing the --camera option.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/main.cpp | 41 +++++++++++++++++++++++++++++++++++++----\n 1 file changed, 37 insertions(+), 4 deletions(-)","diff":"diff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex cc3facd5a5b22092..5af76f6965ef2387 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -21,6 +21,39 @@\n \n using namespace libcamera;\n \n+std::string cameraName(const Camera *camera)\n+{\n+\tconst ControlList &props = camera->properties();\n+\tstd::string name;\n+\n+\tif (props.contains(properties::Model))\n+\t\tname += props.get(properties::Model) + \" \";\n+\n+\tif (props.contains(properties::Location)) {\n+\t\tswitch (props.get(properties::Location)) {\n+\t\tcase properties::CameraLocationFront:\n+\t\t\tname += \"facing front \";\n+\t\t\tbreak;\n+\t\tcase properties::CameraLocationBack:\n+\t\t\tname += \"facing back \";\n+\t\t\tbreak;\n+\t\tcase properties::CameraLocationExternal:\n+\t\t\tname += \"external \";\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\n+\tif (props.contains(properties::Rotation))\n+\t\tname += \"rotated \" + std::to_string(props.get(properties::Rotation)) + \" degrees \";\n+\n+\tif (!name.empty())\n+\t\tname += \"with id \";\n+\n+\tname += camera->id();\n+\n+\treturn name;\n+}\n+\n class CamApp\n {\n public:\n@@ -117,7 +150,7 @@ int CamApp::init(int argc, char **argv)\n \t\t\treturn -EINVAL;\n \t\t}\n \n-\t\tstd::cout << \"Using camera \" << camera_->id() << std::endl;\n+\t\tstd::cout << \"Using camera \" << cameraName(camera_.get()) << std::endl;\n \n \t\tret = prepareConfig();\n \t\tif (ret) {\n@@ -323,12 +356,12 @@ int CamApp::infoConfiguration()\n \n void CamApp::cameraAdded(std::shared_ptr cam)\n {\n-\tstd::cout << \"Camera Added: \" << cam->id() << std::endl;\n+\tstd::cout << \"Camera Added: \" << cameraName(cam.get()) << std::endl;\n }\n \n void CamApp::cameraRemoved(std::shared_ptr cam)\n {\n-\tstd::cout << \"Camera Removed: \" << cam->id() << std::endl;\n+\tstd::cout << \"Camera Removed: \" << cameraName(cam.get()) << std::endl;\n }\n \n int CamApp::run()\n@@ -340,7 +373,7 @@ int CamApp::run()\n \n \t\tunsigned int index = 1;\n \t\tfor (const std::shared_ptr &cam : cm_->cameras()) {\n-\t\t\tstd::cout << index << \": \" << cam->id() << std::endl;\n+\t\t\tstd::cout << index << \": \" << cameraName(cam.get()) << std::endl;\n \t\t\tindex++;\n \t\t}\n \t}\n","prefixes":["libcamera-devel","6/7"]}