diff options
| author | Hirokazu Honda <hiroh@chromium.org> | 2021-05-10 14:42:42 +0900 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-05-24 07:21:02 +0300 |
| commit | a5f8ab82dfa3bb6531df0f9d7a4c3b4c8126a8a9 (patch) | |
| tree | 891db90179470c2799a700d5a1df83c15af90790 /include | |
| parent | afb503fa34d5f537bac106fe94fbf68ad2a6cddf (diff) | |
libcamera: V4L2Control: remove V4L2Control classes
V4L2ControlId and V4L2ControlInfo are just convenience classes to
create ControlId and ControlInfo from v4l2_query_ext_control.
Therefore, there is no need of being a class. It is used only
from V4L2Device. This removes the classes and put the equivalent
functions of creating ControlId and ControlInfo in
v4l2_device.cpp.
Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libcamera/internal/meson.build | 1 | ||||
| -rw-r--r-- | include/libcamera/internal/v4l2_controls.h | 31 | ||||
| -rw-r--r-- | include/libcamera/internal/v4l2_device.h | 4 |
3 files changed, 2 insertions, 34 deletions
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 6cff1b90..f019cfb3 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -43,7 +43,6 @@ libcamera_internal_headers = files([ 'thread.h', 'timer.h', 'utils.h', - 'v4l2_controls.h', 'v4l2_device.h', 'v4l2_pixelformat.h', 'v4l2_subdevice.h', diff --git a/include/libcamera/internal/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h deleted file mode 100644 index 0851b8dd..00000000 --- a/include/libcamera/internal/v4l2_controls.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * v4l2_controls.h - V4L2 Controls Support - */ - -#ifndef __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__ -#define __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__ - -#include <linux/videodev2.h> - -#include <libcamera/controls.h> - -namespace libcamera { - -class V4L2ControlId : public ControlId -{ -public: - V4L2ControlId(const struct v4l2_query_ext_ctrl &ctrl); -}; - -class V4L2ControlInfo : public ControlInfo -{ -public: - V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl); -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_INTERNAL_V4L2_CONTROLS_H__ */ diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index 5ba9b23b..b82e2a14 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -13,11 +13,11 @@ #include <linux/videodev2.h> +#include <libcamera/controls.h> #include <libcamera/signal.h> #include <libcamera/span.h> #include "libcamera/internal/log.h" -#include "libcamera/internal/v4l2_controls.h" namespace libcamera { @@ -63,7 +63,7 @@ private: void eventAvailable(EventNotifier *notifier); std::map<unsigned int, struct v4l2_query_ext_ctrl> controlInfo_; - std::vector<std::unique_ptr<V4L2ControlId>> controlIds_; + std::vector<std::unique_ptr<ControlId>> controlIds_; ControlInfoMap controls_; std::string deviceNode_; int fd_; |