diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-07-20 00:27:37 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2022-07-20 13:25:04 +0300 |
| commit | 4d22621ec11a065b1819f6268335cae81dd50986 (patch) | |
| tree | bfbca9db9689c3b223da05d7e35b69f4dc182407 | |
| parent | b0b66214892ff566c0f4342bb28eaacb1cfa8d68 (diff) | |
libcamera: controls: Drop ControlList::contains()
The ControlList::contains(const ControlId &id) function isn't used, as
it has been replaced by usage of the get() function. Document get as
being the preferred way to check for the presence of a control in a
ControlList, and drop the contains() function.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
| -rw-r--r-- | include/libcamera/controls.h | 1 | ||||
| -rw-r--r-- | src/libcamera/controls.cpp | 15 |
2 files changed, 4 insertions, 12 deletions
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h index 192be784..85a56e62 100644 --- a/include/libcamera/controls.h +++ b/include/libcamera/controls.h @@ -370,7 +370,6 @@ public: void clear() { controls_.clear(); } void merge(const ControlList &source); - bool contains(const ControlId &id) const; bool contains(unsigned int id) const; template<typename T> diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 39c29488..bc3db4f6 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -933,17 +933,6 @@ void ControlList::merge(const ControlList &source) /** * \brief Check if the list contains a control with the specified \a id - * \param[in] id The control ID - * - * \return True if the list contains a matching control, false otherwise - */ -bool ControlList::contains(const ControlId &id) const -{ - return controls_.find(id.id()) != controls_.end(); -} - -/** - * \brief Check if the list contains a control with the specified \a id * \param[in] id The control numerical ID * * \return True if the list contains a matching control, false otherwise @@ -958,6 +947,10 @@ bool ControlList::contains(unsigned int id) const * \brief Get the value of control \a ctrl * \param[in] ctrl The control * + * Beside getting the value of a control, this function can also be used to + * check if a control is present in the ControlList by converting the returned + * std::optional<T> to bool (or calling its has_value() function). + * * \return A std::optional<T> containing the control value, or std::nullopt if * the control \a ctrl is not present in the list */ |