diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-14 00:41:47 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-15 22:33:31 +0300 |
| commit | 207d57c8b4c066a0e70982f28e0084361d7448f2 (patch) | |
| tree | 87a4c329f433dfc4d24241601ef1578d084240c0 /src/libcamera/pipeline/vimc.cpp | |
| parent | 7bb4d7144c3e7c469310d4fd473653fb6cbfc1b8 (diff) | |
libcamera: v4l2_controls: Replace V4L2ControlInfo with V4L2ControlRange
The V4L2ControlInfo class only stores a ControlRange. Make it inherit
from ControlRange to provide a convenience constructor from a struct
v4l2_query_ext_ctrl and rename it to V4L2ControlRange.
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>
Diffstat (limited to 'src/libcamera/pipeline/vimc.cpp')
| -rw-r--r-- | src/libcamera/pipeline/vimc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 78c0fe5a..87e7e54e 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -413,7 +413,7 @@ int VimcCameraData::init(MediaDevice *media) /* Initialise the supported controls. */ const V4L2ControlInfoMap &controls = sensor_->controls(); for (const auto &ctrl : controls) { - const V4L2ControlInfo &info = ctrl.second; + const V4L2ControlRange &range = ctrl.second; const ControlId *id; switch (ctrl.first->id()) { @@ -432,7 +432,7 @@ int VimcCameraData::init(MediaDevice *media) controlInfo_.emplace(std::piecewise_construct, std::forward_as_tuple(id), - std::forward_as_tuple(info.range())); + std::forward_as_tuple(range)); } return 0; |