{"id":9248,"url":"https://patchwork.libcamera.org/api/1.1/patches/9248/?format=json","web_url":"https://patchwork.libcamera.org/patch/9248/","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":"<20200806125330.2983325-3-niklas.soderlund@ragnatech.se>","date":"2020-08-06T12:53:29","name":"[libcamera-devel,2/3] libcamera: pipeline_handler: Mark controls() and properties() as const operations","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"33434472ea7a3055cd89f62274df90ae295d8c0e","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/9248/mbox/","series":[{"id":1203,"url":"https://patchwork.libcamera.org/api/1.1/series/1203/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1203","date":"2020-08-06T12:53:27","name":"libcamera: Mark controls and property accessors as const operations","version":1,"mbox":"https://patchwork.libcamera.org/series/1203/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9248/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9248/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 C2003BD87A\n\tfor ;\n\tThu, 6 Aug 2020 12:53:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 981486071B;\n\tThu, 6 Aug 2020 14:53:44 +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 3069960554\n\tfor ;\n\tThu, 6 Aug 2020 14:53:42 +0200 (CEST)","from bismarck.berto.se (p54ac52a8.dip0.t-ipconnect.de\n\t[84.172.82.168]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid da49ac4d-d7e3-11ea-92dc-005056917a89;\n\tThu, 06 Aug 2020 14:53:41 +0200 (CEST)"],"X-Halon-ID":"da49ac4d-d7e3-11ea-92dc-005056917a89","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 14:53:29 +0200","Message-Id":"<20200806125330.2983325-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200806125330.2983325-1-niklas.soderlund@ragnatech.se>","References":"<20200806125330.2983325-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 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 do not modify the pipeline's state\nand can be marked as const operations.\n\nSigned-off-by: Niklas Söderlund \n---\n include/libcamera/internal/pipeline_handler.h | 4 ++--\n src/libcamera/pipeline_handler.cpp | 4 ++--\n 2 files changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h\nindex d5321ef56df358d0..c4bf1cb68e09d754 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 bc9c1d4b09c5437d..d239135872344a20 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -257,7 +257,7 @@ 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 \treturn data->controlInfo_;\n@@ -268,7 +268,7 @@ 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 \treturn data->properties_;\n","prefixes":["libcamera-devel","2/3"]}