[libcamera-devel,v2,2/3] libcamera: pipeline_handler: Mark controls() and properties() as const operations
diff mbox series

Message ID 20200814104509.189023-3-niklas.soderlund@ragnatech.se
State Accepted
Commit 0b9d8eb265a16a0dda650700759066b714f8fd0c
Headers show
Series
  • libcamera: Mark controls and property accessors as const operations
Related show

Commit Message

Niklas Söderlund Aug. 14, 2020, 10:45 a.m. UTC 
Reading the controls and properties does not modify the pipeline's state
and can be marked as const operations.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
* Changes since v1
- Spelling in commit message.
---
 include/libcamera/internal/pipeline_handler.h | 4 ++--
 src/libcamera/pipeline_handler.cpp            | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index c1873df00b6a2a28..a4e1b529c4611df7 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -68,8 +68,8 @@  public:
 	bool lock();
 	void unlock();
 
-	const ControlInfoMap &controls(Camera *camera);
-	const ControlList &properties(Camera *camera);
+	const ControlInfoMap &controls(const Camera *camera) const;
+	const ControlList &properties(const Camera *camera) const;
 
 	virtual CameraConfiguration *generateConfiguration(Camera *camera,
 		const StreamRoles &roles) = 0;
diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
index 73c51972a225a247..918aea1e8328abc8 100644
--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
@@ -257,9 +257,9 @@  void PipelineHandler::unlock()
  * \context This function is \threadsafe.
  * \return A ControlInfoMap listing the controls support by \a camera
  */
-const ControlInfoMap &PipelineHandler::controls(Camera *camera)
+const ControlInfoMap &PipelineHandler::controls(const Camera *camera) const
 {
-	CameraData *data = cameraData(camera);
+	const CameraData *data = cameraData(camera);
 	return data->controlInfo_;
 }
 
@@ -268,9 +268,9 @@  const ControlInfoMap &PipelineHandler::controls(Camera *camera)
  * \param[in] camera The camera
  * \return A ControlList of properties supported by \a camera
  */
-const ControlList &PipelineHandler::properties(Camera *camera)
+const ControlList &PipelineHandler::properties(const Camera *camera) const
 {
-	CameraData *data = cameraData(camera);
+	const CameraData *data = cameraData(camera);
 	return data->properties_;
 }