From e5a9e6e9cd3e12efe9ce078171fbe67d7d41a771 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 1 Mar 2020 22:02:37 +0200 Subject: 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 Reviewed-by: Jacopo Mondi --- include/libcamera/controls.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include/libcamera/controls.h') 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; -class ControlInfoMap : private std::unordered_map +class ControlInfoMap : private std::unordered_map { public: - using Map = std::unordered_map; + using Map = std::unordered_map; ControlInfoMap() = default; ControlInfoMap(const ControlInfoMap &other) = default; -- cgit v1.2.1