PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: controls: Rename ControlValueType to ControlType

Browse Source 
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>
This commit is contained in:
Laurent Pinchart
2019-09-27 23:59:19 +03:00
parent 594de3aed3
commit c5dfd9d57e
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
include/libcamera/controls.h
View File

@@ -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_; }