libcamera: v4l2_controls: Store a ControlRange in V4L2ControlInfoMap

V4L2ControlRange only offers a convenience constructor for a
ControlRange. Store the ControlRange instead of V4L2ControlRange in
V4L2ControlInfoMap to make the map less dependent on V4L2 types.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

1 files changed, 19 insertions, 19 deletions

diff --git a/src/libcamera/include/v4l2_controls.h b/src/libcamera/include/v4l2_controls.h
index 74156982..7d3528b0 100644
--- a/src/libcamera/include/v4l2_controls.h
+++ b/src/libcamera/include/v4l2_controls.h
@@ -31,27 +31,27 @@ public:
 	V4L2ControlRange(const struct v4l2_query_ext_ctrl &ctrl);
 };
 
-class V4L2ControlInfoMap : private std::map<const ControlId *, V4L2ControlRange>
+class V4L2ControlInfoMap : private std::map<const ControlId *, ControlRange>
 {
 public:
-	V4L2ControlInfoMap &operator=(std::map<const ControlId *, V4L2ControlRange> &&info);
-
-	using std::map<const ControlId *, V4L2ControlRange>::key_type;
-	using std::map<const ControlId *, V4L2ControlRange>::mapped_type;
-	using std::map<const ControlId *, V4L2ControlRange>::value_type;
-	using std::map<const ControlId *, V4L2ControlRange>::size_type;
-	using std::map<const ControlId *, V4L2ControlRange>::iterator;
-	using std::map<const ControlId *, V4L2ControlRange>::const_iterator;
-
-	using std::map<const ControlId *, V4L2ControlRange>::begin;
-	using std::map<const ControlId *, V4L2ControlRange>::cbegin;
-	using std::map<const ControlId *, V4L2ControlRange>::end;
-	using std::map<const ControlId *, V4L2ControlRange>::cend;
-	using std::map<const ControlId *, V4L2ControlRange>::at;
-	using std::map<const ControlId *, V4L2ControlRange>::empty;
-	using std::map<const ControlId *, V4L2ControlRange>::size;
-	using std::map<const ControlId *, V4L2ControlRange>::count;
-	using std::map<const ControlId *, V4L2ControlRange>::find;
+	V4L2ControlInfoMap &operator=(std::map<const ControlId *, ControlRange> &&info);
+
+	using std::map<const ControlId *, ControlRange>::key_type;
+	using std::map<const ControlId *, ControlRange>::mapped_type;
+	using std::map<const ControlId *, ControlRange>::value_type;
+	using std::map<const ControlId *, ControlRange>::size_type;
+	using std::map<const ControlId *, ControlRange>::iterator;
+	using std::map<const ControlId *, ControlRange>::const_iterator;
+
+	using std::map<const ControlId *, ControlRange>::begin;
+	using std::map<const ControlId *, ControlRange>::cbegin;
+	using std::map<const ControlId *, ControlRange>::end;
+	using std::map<const ControlId *, ControlRange>::cend;
+	using std::map<const ControlId *, ControlRange>::at;
+	using std::map<const ControlId *, ControlRange>::empty;
+	using std::map<const ControlId *, ControlRange>::size;
+	using std::map<const ControlId *, ControlRange>::count;
+	using std::map<const ControlId *, ControlRange>::find;
 
 	mapped_type &at(unsigned int key);
 	const mapped_type &at(unsigned int key) const;