From 319d6ae8e3ad1a47a674e85015de9ea811e84564 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 14 Oct 2019 02:08:44 +0300 Subject: libcamera: controls: Merge ControlInfoMap and V4L2ControlInfoMap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ControlInfoMap and V4L2ControlInfoMap classes are very similar, with the latter adding convenience accessors based on numerical IDs for the former, as well as a cached idmap. Both features can be useful for ControlInfoMap in the context of serialisation, and merging the two classes will further simplify the IPA API. Import all the features of V4L2ControlInfoMap into ControlInfoMap, turning the latter into a real class. A few new constructors and assignment operators are added for completeness. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Jacopo Mondi --- test/v4l2_videodevice/controls.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/v4l2_videodevice') diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 182228f3..31879b79 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -26,7 +26,7 @@ public: protected: int run() { - const V4L2ControlInfoMap &info = capture_->controls(); + const ControlInfoMap &info = capture_->controls(); /* Test control enumeration. */ if (info.empty()) { -- cgit v1.2.1