From 89916a486cbdf352ba55bbe595942f2a3f9a1349 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Wed, 7 Oct 2020 19:57:18 +0100
Subject: 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>
---
include/libcamera/control_ids.h.in | 6 ++++++
include/libcamera/property_ids.h.in | 6 ++++++
2 files changed, 12 insertions(+)
(limited to 'include')
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 */
--
cgit v1.2.1