diff options
| -rw-r--r-- | src/libcamera/include/v4l2_controls.h | 16 | ||||
| -rw-r--r-- | src/libcamera/v4l2_controls.cpp | 20 | ||||
| -rw-r--r-- | src/libcamera/v4l2_device.cpp | 9 |
3 files changed, 40 insertions, 5 deletions
diff --git a/src/libcamera/include/v4l2_controls.h b/src/libcamera/include/v4l2_controls.h index 949ca21c..8990e755 100644 --- a/src/libcamera/include/v4l2_controls.h +++ b/src/libcamera/include/v4l2_controls.h @@ -43,7 +43,21 @@ private: ControlRange range_; }; -using V4L2ControlInfoMap = std::map<unsigned int, V4L2ControlInfo>; +class V4L2ControlInfoMap : private std::map<unsigned int, V4L2ControlInfo> +{ +public: + V4L2ControlInfoMap &operator=(std::map<unsigned int, V4L2ControlInfo> &&info); + + using std::map<unsigned int, V4L2ControlInfo>::begin; + using std::map<unsigned int, V4L2ControlInfo>::cbegin; + using std::map<unsigned int, V4L2ControlInfo>::end; + using std::map<unsigned int, V4L2ControlInfo>::cend; + using std::map<unsigned int, V4L2ControlInfo>::at; + using std::map<unsigned int, V4L2ControlInfo>::empty; + using std::map<unsigned int, V4L2ControlInfo>::size; + using std::map<unsigned int, V4L2ControlInfo>::count; + using std::map<unsigned int, V4L2ControlInfo>::find; +}; class V4L2Control { diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp index 3f5f3ff1..3be21997 100644 --- a/src/libcamera/v4l2_controls.cpp +++ b/src/libcamera/v4l2_controls.cpp @@ -156,11 +156,29 @@ V4L2ControlInfo::V4L2ControlInfo(const struct v4l2_query_ext_ctrl &ctrl) */ /** - * \typedef V4L2ControlInfoMap + * \class V4L2ControlInfoMap * \brief A map of control ID to V4L2ControlInfo */ /** + * \brief Move assignment operator from plain map + * \param[in] info The control info map + * + * Populate the map by replacing its contents with those of \a info using move + * semantics. Upon return the \a info map will be empty. + * + * This is the only supported way to populate a V4L2ControlInfoMap. + * + * \return The populated V4L2ControlInfoMap + */ +V4L2ControlInfoMap &V4L2ControlInfoMap::operator=(std::map<unsigned int, V4L2ControlInfo> &&info) +{ + std::map<unsigned int, V4L2ControlInfo>::operator=(std::move(info)); + + return *this; +} + +/** * \class V4L2Control * \brief A V4L2 control value * diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 8c599843..1f755f0f 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -340,6 +340,7 @@ int V4L2Device::ioctl(unsigned long request, void *argp) */ void V4L2Device::listControls() { + std::map<unsigned int, V4L2ControlInfo> ctrls; struct v4l2_query_ext_ctrl ctrl = {}; /* \todo Add support for menu and compound controls. */ @@ -368,10 +369,12 @@ void V4L2Device::listControls() continue; } - controls_.emplace(std::piecewise_construct, - std::forward_as_tuple(ctrl.id), - std::forward_as_tuple(ctrl)); + ctrls.emplace(std::piecewise_construct, + std::forward_as_tuple(ctrl.id), + std::forward_as_tuple(ctrl)); } + + controls_ = std::move(ctrls); } /* |