Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-16 08:55:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: controls: Reorder ControlValue methods

Browse source 
Reorder functions in ControlValue class to group const methods together.

Cosmetic change only.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Jacopo Mondi 2020-01-02 15:45:17 +01:00 • committed by Laurent Pinchart
parent 8c051160e7
commit dd09239600
2 changed files with 52 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/libcamera/controls.h
View file

@ -33,11 +33,6 @@ public:
ControlType type() const { return type_; }
bool isNone() const { return type_ == ControlTypeNone; }
template<typename T>
const T &get() const;
template<typename T>
void set(const T &value);
std::string toString() const;
bool operator==(const ControlValue &other) const;
@ -46,6 +41,11 @@ public:
return !(*this == other);
}
template<typename T>
const T &get() const;
template<typename T>
void set(const T &value);
private:
ControlType type_;

94
src/libcamera/controls.cpp
View file

@ -112,6 +112,53 @@ ControlValue::ControlValue(int64_t value)
* \return True if the value type is ControlTypeNone, false otherwise
*/
/**
* \brief Assemble and return a string describing the value
* \return A string describing the ControlValue
*/
std::string ControlValue::toString() const
{
switch (type_) {
case ControlTypeNone:
return "<None>";
case ControlTypeBool:
return bool_ ? "True" : "False";
case ControlTypeInteger32:
return std::to_string(integer32_);
case ControlTypeInteger64:
return std::to_string(integer64_);
}
return "<ValueType Error>";
}
/**
* \brief Compare ControlValue instances for equality
* \return True if the values have identical types and values, false otherwise
*/
bool ControlValue::operator==(const ControlValue &other) const
{
if (type_ != other.type_)
return false;
switch (type_) {
case ControlTypeBool:
return bool_ == other.bool_;
case ControlTypeInteger32:
return integer32_ == other.integer32_;
case ControlTypeInteger64:
return integer64_ == other.integer64_;
default:
return false;
}
}
/**
* \fn bool ControlValue::operator!=()
* \brief Compare ControlValue instances for non equality
* \return False if the values have identical types and values, true otherwise
*/
/**
* \fn template<typename T> const T &ControlValue::get() const
* \brief Get the control value
@ -175,53 +222,6 @@ void ControlValue::set<int64_t>(const int64_t &value)
}
#endif /* __DOXYGEN__ */
/**
* \brief Assemble and return a string describing the value
* \return A string describing the ControlValue
*/
std::string ControlValue::toString() const
{
switch (type_) {
case ControlTypeNone:
return "<None>";
case ControlTypeBool:
return bool_ ? "True" : "False";
case ControlTypeInteger32:
return std::to_string(integer32_);
case ControlTypeInteger64:
return std::to_string(integer64_);
}
return "<ValueType Error>";
}
/**
* \brief Compare ControlValue instances for equality
* \return True if the values have identical types and values, false otherwise
*/
bool ControlValue::operator==(const ControlValue &other) const
{
if (type_ != other.type_)
return false;
switch (type_) {
case ControlTypeBool:
return bool_ == other.bool_;
case ControlTypeInteger32:
return integer32_ == other.integer32_;
case ControlTypeInteger64:
return integer64_ == other.integer64_;
default:
return false;
}
}
/**
* \fn bool ControlValue::operator!=()
* \brief Compare ControlValue instances for non equality
* \return False if the values have identical types and values, true otherwise
*/
/**
* \class ControlId
* \brief Control static metadata