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

Message ID 20200814104509.189023-4-niklas.soderlund@ragnatech.se
State Accepted
Commit 54ca46968a18ab938fc61f9424f421a004f50405
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 camera'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/camera.h | 4 ++--
 src/libcamera/camera.cpp   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch
diff mbox series 

diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index 48d88d64a0a94050..272c12c3c47392fc 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -86,8 +86,8 @@  public:
 	int acquire();
 	int release();
 
-	const ControlInfoMap &controls();
-	const ControlList &properties();
+	const ControlInfoMap &controls() const;
+	const ControlList &properties() const;
 
 	const std::set<Stream *> &streams() const;
 	std::unique_ptr<CameraConfiguration> generateConfiguration(const StreamRoles &roles = {});
diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp
index 820fa1e3065e5f88..1685697b8ebbebcb 100644
--- a/src/libcamera/camera.cpp
+++ b/src/libcamera/camera.cpp
@@ -658,7 +658,7 @@  int Camera::release()
  *
  * \return A ControlInfoMap listing the controls supported by the camera
  */
-const ControlInfoMap &Camera::controls()
+const ControlInfoMap &Camera::controls() const
 {
 	return p_->pipe_->controls(this);
 }
@@ -671,7 +671,7 @@  const ControlInfoMap &Camera::controls()
  *
  * \return A ControlList of properties supported by the camera
  */
-const ControlList &Camera::properties()
+const ControlList &Camera::properties() const
 {
 	return p_->pipe_->properties(this);
 }