summaryrefslogtreecommitdiff
path: root/include
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 /include
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 'include')
-rw-r--r--include/libcamera/control_ids.h.in6
-rw-r--r--include/libcamera/property_ids.h.in6
2 files changed, 12 insertions, 0 deletions
diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in
index 95a7a7f1..baadca83 100644
--- a/include/libcamera/control_ids.h.in
+++ b/include/libcamera/control_ids.h.in
@@ -26,6 +26,12 @@ ${controls}
extern const ControlIdMap controls;
+namespace draft {
+
+${draft_controls}
+
+} /* namespace draft */
+
} /* namespace controls */
} /* namespace libcamera */
diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in
index e4dea335..52646c1f 100644
--- a/include/libcamera/property_ids.h.in
+++ b/include/libcamera/property_ids.h.in
@@ -24,6 +24,12 @@ ${ids}
${controls}
+namespace draft {
+
+${draft_controls}
+
+} /* namespace draft */
+
extern const ControlIdMap properties;
} /* namespace properties */