From c5dfd9d57eae881626a842c666cc6140b11bbba4 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 27 Sep 2019 23:59:19 +0300 Subject: libcamera: controls: Rename ControlValueType to ControlType MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The type of a control value is also the type of the control. Shorten the ControlValueType enumeration to ControlType, and rename ControlValue* to ControlType* for better clarity. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Reviewed-by: Niklas Söderlund --- include/libcamera/controls.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'include') diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index fbb3a622..ffba880a 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -18,11 +18,11 @@ namespace libcamera { class Camera; -enum ControlValueType { - ControlValueNone, - ControlValueBool, - ControlValueInteger, - ControlValueInteger64, +enum ControlType { + ControlTypeNone, + ControlTypeBool, + ControlTypeInteger, + ControlTypeInteger64, }; class ControlValue @@ -33,8 +33,8 @@ public: ControlValue(int value); ControlValue(int64_t value); - ControlValueType type() const { return type_; }; - bool isNone() const { return type_ == ControlValueNone; }; + ControlType type() const { return type_; }; + bool isNone() const { return type_ == ControlTypeNone; }; void set(bool value); void set(int value); @@ -47,7 +47,7 @@ public: std::string toString() const; private: - ControlValueType type_; + ControlType type_; union { bool bool_; @@ -59,7 +59,7 @@ private: struct ControlIdentifier { ControlId id; const char *name; - ControlValueType type; + ControlType type; }; class ControlInfo @@ -70,7 +70,7 @@ public: ControlId id() const { return ident_->id; } const char *name() const { return ident_->name; } - ControlValueType type() const { return ident_->type; } + ControlType type() const { return ident_->type; } const ControlValue &min() const { return min_; } const ControlValue &max() const { return max_; } -- cgit v1.2.1