From 034b5d36992cbb345edbc7e9f7219d1093cbcf00 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 30 Jul 2021 06:05:45 +0300 Subject: libcamera: pipeline_handler: Drop controls() and properties() functions The PipelineHandler controls() and properties() functions are only used by the Camera class. Now that the controls and properties are stored in the Camera::Private class, we can drop those functions and access the private data directly in Camera::controls() and Camera::properties(). Suggested-by: Jacopo Mondi Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- src/libcamera/camera.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libcamera/camera.cpp') diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index a22cc7b8..c20e0501 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -800,7 +800,7 @@ int Camera::release() */ const ControlInfoMap &Camera::controls() const { - return _d()->pipe_->controls(this); + return _d()->controlInfo_; } /** @@ -813,7 +813,7 @@ const ControlInfoMap &Camera::controls() const */ const ControlList &Camera::properties() const { - return _d()->pipe_->properties(this); + return _d()->properties_; } /** -- cgit v1.2.1