From cdc68bf7f775538bcc58ff85a14cf89fc6c8668e Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Wed, 23 Oct 2019 09:40:27 +0200 Subject: libcamera: controls: Store reference to the InfoMap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Store a reference to the ControlInfoMap used to create a ControlList and provide an operation to retrieve it. This will be used to implement serialization of ControlList. Signed-off-by: Jacopo Mondi Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/libcamera/controls.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'src/libcamera/controls.cpp') diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 9c6474ad..594fed84 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -597,7 +597,7 @@ void ControlInfoMap::generateIdmap() * be used directly by application. */ ControlList::ControlList() - : validator_(nullptr), idmap_(nullptr) + : validator_(nullptr), idmap_(nullptr), infoMap_(nullptr) { } @@ -611,7 +611,7 @@ ControlList::ControlList() * argument. */ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator) - : validator_(validator), idmap_(&idmap) + : validator_(validator), idmap_(&idmap), infoMap_(nullptr) { } @@ -621,7 +621,7 @@ ControlList::ControlList(const ControlIdMap &idmap, ControlValidator *validator) * \param[in] validator The validator (may be null) */ ControlList::ControlList(const ControlInfoMap &info, ControlValidator *validator) - : validator_(validator), idmap_(&info.idmap()) + : validator_(validator), idmap_(&info.idmap()), infoMap_(&info) { } @@ -771,6 +771,16 @@ void ControlList::set(unsigned int id, const ControlValue &value) *val = value; } +/** + * \fn ControlList::infoMap() + * \brief Retrieve the ControlInfoMap used to construct the ControlList + * + * \return The ControlInfoMap used to construct the ControlList. ControlList + * instances constructed with ControlList() or + * ControlList(const ControlIdMap &idmap, ControlValidator *validator) have no + * associated ControlInfoMap, nullptr is returned in that case. + */ + const ControlValue *ControlList::find(unsigned int id) const { const auto iter = controls_.find(id); -- cgit v1.2.1