summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2020-10-07 19:57:18 +0100
committerJacopo Mondi <jacopo@jmondi.org>2020-10-26 17:51:54 +0100
commit89916a486cbdf352ba55bbe595942f2a3f9a1349 (patch)
tree7c3db889b06530048d034ad9c5c38f75bd4b2328 /src
parent581bb274956fcf7e781384342e88cd8fa35b1336 (diff)
libcamera: Support draft controls and properties
Extend the control and property framework to support exposing draft controls and properties in a scoped namespace. The controls/properties themselves will retain the same ordering in the relevant enum/id maps - but the access to any draft control will require explicitly referencing through its' draft:: namespace prefix. Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com> [Added missing hunk in control_ids.cpp.in and changed subject] Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/control_ids.cpp.in15
-rw-r--r--src/libcamera/property_ids.cpp.in15
2 files changed, 30 insertions, 0 deletions
diff --git a/src/libcamera/control_ids.cpp.in b/src/libcamera/control_ids.cpp.in
index cba6258d..056645cf 100644
--- a/src/libcamera/control_ids.cpp.in
+++ b/src/libcamera/control_ids.cpp.in
@@ -23,12 +23,27 @@ namespace controls {
${controls_doc}
+/**
+ * \brief Namespace for libcamera draft controls
+ */
+namespace draft {
+
+${draft_controls_doc}
+
+} /* namespace draft */
+
#ifndef __DOXYGEN__
/*
* Keep the controls definitions hidden from doxygen as it incorrectly parses
* them as functions.
*/
${controls_def}
+
+namespace draft {
+
+${draft_controls_def}
+
+} /* namespace draft */
#endif
/**
diff --git a/src/libcamera/property_ids.cpp.in b/src/libcamera/property_ids.cpp.in
index bfdd823f..f917e334 100644
--- a/src/libcamera/property_ids.cpp.in
+++ b/src/libcamera/property_ids.cpp.in
@@ -23,12 +23,27 @@ namespace properties {
${controls_doc}
+/**
+ * \brief Namespace for libcamera draft properties
+ */
+namespace draft {
+
+${draft_controls_doc}
+
+} /* namespace draft */
+
#ifndef __DOXYGEN__
/*
* Keep the properties definitions hidden from doxygen as it incorrectly parses
* them as functions.
*/
${controls_def}
+
+namespace draft {
+
+${draft_controls_def}
+
+} /* namespace draft */
#endif
/**