summaryrefslogtreecommitdiff
path: root/include/libcamera
diff options
context:
space:
mode:
Diffstat (limited to 'include/libcamera')
-rw-r--r--include/libcamera/control_ids.h.in6
-rw-r--r--include/libcamera/meson.build2
-rw-r--r--include/libcamera/property_ids.h.in6
3 files changed, 2 insertions, 12 deletions
diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in
index c97b09a8..d53b1cf7 100644
--- a/include/libcamera/control_ids.h.in
+++ b/include/libcamera/control_ids.h.in
@@ -26,12 +26,6 @@ ${controls}
extern const ControlIdMap controls;
-namespace draft {
-
-${draft_controls}
-
-} /* namespace draft */
-
${vendor_controls}
} /* namespace controls */
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index a2bb5d16..bab858a3 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -34,10 +34,12 @@ libcamera_headers_install_dir = get_option('includedir') / libcamera_include_dir
controls_map = {
'controls': {
+ 'draft': 'control_ids_draft.yaml',
'core': 'control_ids_core.yaml',
},
'properties': {
+ 'draft': 'property_ids_draft.yaml',
'core': 'property_ids_core.yaml',
}
}
diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in
index 47c5d6bf..43372c71 100644
--- a/include/libcamera/property_ids.h.in
+++ b/include/libcamera/property_ids.h.in
@@ -23,12 +23,6 @@ ${ids}
${controls}
-namespace draft {
-
-${draft_controls}
-
-} /* namespace draft */
-
extern const ControlIdMap properties;
${vendor_controls}