summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-27 23:59:19 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-10-04 19:33:08 +0300
commitc5dfd9d57eae881626a842c666cc6140b11bbba4 (patch)
tree8450ecdebc08ee80275b5bef936952a5dea87e7a /include
parent594de3aed3f1e490936db0e982903a85b8cdc36a (diff)
libcamera: controls: Rename ControlValueType to ControlType
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'include')
-rw-r--r--include/libcamera/controls.h20
1 files changed, 10 insertions, 10 deletions
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_; }