summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-01 22:02:37 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-20 16:47:45 +0200
commite5a9e6e9cd3e12efe9ce078171fbe67d7d41a771 (patch)
treec73bc72211ca61c44eda396151b466d4a7a8c1ab /include
parent73b7ba9da5fe7b1aec62af091ad36403cd3505c4 (diff)
libcamera: controls: Rename ControlRange to ControlInfo
To prepare for storage of additional information in the ControlRange structure, rename it to ControlInfo. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'include')
-rw-r--r--include/ipa/ipa_controls.h2
-rw-r--r--include/libcamera/controls.h16
2 files changed, 9 insertions, 9 deletions
diff --git a/include/ipa/ipa_controls.h b/include/ipa/ipa_controls.h
index 37f97d6a..6d3bf279 100644
--- a/include/ipa/ipa_controls.h
+++ b/include/ipa/ipa_controls.h
@@ -33,7 +33,7 @@ struct ipa_control_value_entry {
uint32_t padding[1];
};
-struct ipa_control_range_entry {
+struct ipa_control_info_entry {
uint32_t id;
uint32_t type;
uint32_t offset;
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index 3d2250f4..9c6cbffb 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -229,12 +229,12 @@ private:
Control &operator=(const Control &) = delete;
};
-class ControlRange
+class ControlInfo
{
public:
- explicit ControlRange(const ControlValue &min = 0,
- const ControlValue &max = 0,
- const ControlValue &def = 0);
+ explicit ControlInfo(const ControlValue &min = 0,
+ const ControlValue &max = 0,
+ const ControlValue &def = 0);
const ControlValue &min() const { return min_; }
const ControlValue &max() const { return max_; }
@@ -242,12 +242,12 @@ public:
std::string toString() const;
- bool operator==(const ControlRange &other) const
+ bool operator==(const ControlInfo &other) const
{
return min_ == other.min_ && max_ == other.max_;
}
- bool operator!=(const ControlRange &other) const
+ bool operator!=(const ControlInfo &other) const
{
return !(*this == other);
}
@@ -260,10 +260,10 @@ private:
using ControlIdMap = std::unordered_map<unsigned int, const ControlId *>;
-class ControlInfoMap : private std::unordered_map<const ControlId *, ControlRange>
+class ControlInfoMap : private std::unordered_map<const ControlId *, ControlInfo>
{
public:
- using Map = std::unordered_map<const ControlId *, ControlRange>;
+ using Map = std::unordered_map<const ControlId *, ControlInfo>;
ControlInfoMap() = default;
ControlInfoMap(const ControlInfoMap &other) = default;