{"id":9326,"url":"https://patchwork.libcamera.org/api/patches/9326/?format=json","web_url":"https://patchwork.libcamera.org/patch/9326/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200814104509.189023-3-niklas.soderlund@ragnatech.se>","date":"2020-08-14T10:45:08","name":"[libcamera-devel,v2,2/3] libcamera: pipeline_handler: Mark controls() and properties() as const operations","commit_ref":"0b9d8eb265a16a0dda650700759066b714f8fd0c","pull_url":null,"state":"accepted","archived":false,"hash":"3d0e9032263eb9df23f5ef803cc277eba038673a","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9326/mbox/","series":[{"id":1220,"url":"https://patchwork.libcamera.org/api/series/1220/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1220","date":"2020-08-14T10:45:06","name":"libcamera: Mark controls and property accessors as const operations","version":2,"mbox":"https://patchwork.libcamera.org/series/1220/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9326/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9326/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 DD858BD87D\n\tfor ;\n\tFri, 14 Aug 2020 10:45:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 486516160D;\n\tFri, 14 Aug 2020 12:45:22 +0200 (CEST)","from bin-mail-out-05.binero.net (bin-mail-out-05.binero.net\n\t[195.74.38.228])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 985C2613B4\n\tfor ;\n\tFri, 14 Aug 2020 12:45:20 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 3f350834-de1b-11ea-a39b-005056917f90;\n\tFri, 14 Aug 2020 12:45:19 +0200 (CEST)"],"X-Halon-ID":"3f350834-de1b-11ea-a39b-005056917f90","Authorized-sender":"niklas.soderlund@fsdn.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 14 Aug 2020 12:45:08 +0200","Message-Id":"<20200814104509.189023-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200814104509.189023-1-niklas.soderlund@ragnatech.se>","References":"<20200814104509.189023-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 2/3] libcamera: pipeline_handler: Mark\n\tcontrols() and properties() as const operations","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":"Reading the controls and properties does not modify the pipeline's state\nand can be marked as const operations.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Kieran Bingham \n---\n* Changes since v1\n- Spelling in commit message.\n---\n include/libcamera/internal/pipeline_handler.h | 4 ++--\n src/libcamera/pipeline_handler.cpp | 8 ++++----\n 2 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex c1873df00b6a2a28..a4e1b529c4611df7 100644\n--- a/include/libcamera/internal/pipeline_handler.h\n+++ b/include/libcamera/internal/pipeline_handler.h\n@@ -68,8 +68,8 @@ public:\n \tbool lock();\n \tvoid unlock();\n \n-\tconst ControlInfoMap &controls(Camera *camera);\n-\tconst ControlList &properties(Camera *camera);\n+\tconst ControlInfoMap &controls(const Camera *camera) const;\n+\tconst ControlList &properties(const Camera *camera) const;\n \n \tvirtual CameraConfiguration *generateConfiguration(Camera *camera,\n \t\tconst StreamRoles &roles) = 0;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 73c51972a225a247..918aea1e8328abc8 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -257,9 +257,9 @@ void PipelineHandler::unlock()\n * \\context This function is \\threadsafe.\n * \\return A ControlInfoMap listing the controls support by \\a camera\n */\n-const ControlInfoMap &PipelineHandler::controls(Camera *camera)\n+const ControlInfoMap &PipelineHandler::controls(const Camera *camera) const\n {\n-\tCameraData *data = cameraData(camera);\n+\tconst CameraData *data = cameraData(camera);\n \treturn data->controlInfo_;\n }\n \n@@ -268,9 +268,9 @@ const ControlInfoMap &PipelineHandler::controls(Camera *camera)\n * \\param[in] camera The camera\n * \\return A ControlList of properties supported by \\a camera\n */\n-const ControlList &PipelineHandler::properties(Camera *camera)\n+const ControlList &PipelineHandler::properties(const Camera *camera) const\n {\n-\tCameraData *data = cameraData(camera);\n+\tconst CameraData *data = cameraData(camera);\n \treturn data->properties_;\n }\n \n","prefixes":["libcamera-devel","v2","2/3"]}