@@ -12,8 +12,8 @@
#include <stdint.h>
#include <string>
+#include <libcamera/class.h>
#include <libcamera/controls.h>
-#include <libcamera/extensible.h>
#include <libcamera/object.h>
#include <libcamera/request.h>
#include <libcamera/signal.h>
@@ -12,7 +12,7 @@
#include <sys/types.h>
#include <vector>
-#include <libcamera/extensible.h>
+#include <libcamera/class.h>
#include <libcamera/object.h>
#include <libcamera/signal.h>
similarity index 86%
rename from include/libcamera/extensible.h
rename to include/libcamera/class.h
@@ -2,10 +2,10 @@
/*
* Copyright (C) 2020, Google Inc.
*
- * extensible.h - Utilities to create extensible public classes with stable ABIs
+ * class.h - Utilities and helpers for classes
*/
-#ifndef __LIBCAMERA_EXTENSIBLE_H__
-#define __LIBCAMERA_EXTENSIBLE_H__
+#ifndef __LIBCAMERA_CLASS_H__
+#define __LIBCAMERA_CLASS_H__
#include <memory>
@@ -84,4 +84,4 @@ private:
} /* namespace libcamera */
-#endif /* __LIBCAMERA_EXTENSIBLE_H__ */
+#endif /* __LIBCAMERA_CLASS_H__ */
@@ -5,9 +5,9 @@ libcamera_public_headers = files([
'buffer.h',
'camera.h',
'camera_manager.h',
+ 'class.h',
'compiler.h',
'controls.h',
- 'extensible.h',
'file_descriptor.h',
'framebuffer_allocator.h',
'geometry.h',
similarity index 94%
rename from src/libcamera/extensible.cpp
rename to src/libcamera/class.cpp
@@ -2,14 +2,17 @@
/*
* Copyright (C) 2020, Google Inc.
*
- * extensible.cpp - Utilities to create extensible public classes with stable ABIs
+ * class.cpp - Utilities and helpers for classes
*/
-#include <libcamera/extensible.h>
+#include <libcamera/class.h>
/**
- * \file extensible.h
- * \brief Utilities to create extensible public classes with stable ABIs
+ * \file class.h
+ * \brief Utilities to help constructing class interfaces
+ *
+ * The extensible class can be inherited to create public classes with stable
+ * ABIs.
*/
namespace libcamera {
@@ -9,6 +9,7 @@ libcamera_sources = files([
'camera_controls.cpp',
'camera_manager.cpp',
'camera_sensor.cpp',
+ 'class.cpp',
'controls.cpp',
'control_serializer.cpp',
'control_validator.cpp',
@@ -18,7 +19,6 @@ libcamera_sources = files([
'event_dispatcher.cpp',
'event_dispatcher_poll.cpp',
'event_notifier.cpp',
- 'extensible.cpp',
'file.cpp',
'file_descriptor.cpp',
'formats.cpp',