[libcamera-devel,v2,07/24] libcamera: controls: Make ControlId constructor public

Message ID 20191108205409.18845-8-laurent.pinchart@ideasonboard.com
State Accepted
Headers show
Series
  • Control serialization and IPA C API
Related show

Commit Message

Laurent Pinchart Nov. 8, 2019, 8:53 p.m. UTC
From: Jacopo Mondi <jacopo@jmondi.org>

In order to be able to create a ControlId from serialized data, make its
constructor public.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
---
 include/libcamera/controls.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

Niklas Söderlund Nov. 18, 2019, 5:11 p.m. UTC | #1
Hi Jacopo,

Thanks for your work.

On 2019-11-08 22:53:52 +0200, Laurent Pinchart wrote:
> From: Jacopo Mondi <jacopo@jmondi.org>
> 
> In order to be able to create a ControlId from serialized data, make its
> constructor public.
> 
> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  include/libcamera/controls.h | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
> index 548c06c65bb6..6bad36cbc369 100644
> --- a/include/libcamera/controls.h
> +++ b/include/libcamera/controls.h
> @@ -59,16 +59,15 @@ private:
>  class ControlId
>  {
>  public:
> -	unsigned int id() const { return id_; }
> -	const std::string &name() const { return name_; }
> -	ControlType type() const { return type_; }
> -
> -protected:
>  	ControlId(unsigned int id, const std::string &name, ControlType type)
>  		: id_(id), name_(name), type_(type)
>  	{
>  	}
>  
> +	unsigned int id() const { return id_; }
> +	const std::string &name() const { return name_; }
> +	ControlType type() const { return type_; }
> +
>  private:
>  	ControlId &operator=(const ControlId &) = delete;
>  	ControlId(const ControlId &) = delete;
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index 548c06c65bb6..6bad36cbc369 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -59,16 +59,15 @@  private:
 class ControlId
 {
 public:
-	unsigned int id() const { return id_; }
-	const std::string &name() const { return name_; }
-	ControlType type() const { return type_; }
-
-protected:
 	ControlId(unsigned int id, const std::string &name, ControlType type)
 		: id_(id), name_(name), type_(type)
 	{
 	}
 
+	unsigned int id() const { return id_; }
+	const std::string &name() const { return name_; }
+	ControlType type() const { return type_; }
+
 private:
 	ControlId &operator=(const ControlId &) = delete;
 	ControlId(const ControlId &) = delete;