summaryrefslogtreecommitdiff
path: root/include/libcamera/internal
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 00:09:15 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-06-25 16:11:03 +0100
commit6410d1d37c1ea9d1d168840a7ba063facb0bc9d6 (patch)
treed23c636895d51df3b4b6fe128f322132203a3a26 /include/libcamera/internal
parentcbdc93e9d1666010d49e06940158a37c61cc6fa7 (diff)
libcamera/base: Move class helpers to the base library
Move the class support infrastructure to the base library. Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include/libcamera/internal')
-rw-r--r--include/libcamera/internal/buffer.h3
-rw-r--r--include/libcamera/internal/byte_stream_buffer.h3
-rw-r--r--include/libcamera/internal/camera_sensor.h3
-rw-r--r--include/libcamera/internal/file.h3
-rw-r--r--include/libcamera/internal/log.h3
-rw-r--r--include/libcamera/internal/media_object.h2
-rw-r--r--include/libcamera/internal/pipeline_handler.h3
-rw-r--r--include/libcamera/internal/v4l2_subdevice.h3
-rw-r--r--include/libcamera/internal/v4l2_videodevice.h3
9 files changed, 16 insertions, 10 deletions
diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/buffer.h
index 9da1fbd1..91dd2496 100644
--- a/include/libcamera/internal/buffer.h
+++ b/include/libcamera/internal/buffer.h
@@ -10,7 +10,8 @@
#include <sys/mman.h>
#include <vector>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/buffer.h>
#include <libcamera/span.h>
diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h
index 866cb9b0..7eefb1a7 100644
--- a/include/libcamera/internal/byte_stream_buffer.h
+++ b/include/libcamera/internal/byte_stream_buffer.h
@@ -11,7 +11,8 @@
#include <stdint.h>
#include <type_traits>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/span.h>
namespace libcamera {
diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h
index e133ebf4..7bc54061 100644
--- a/include/libcamera/internal/camera_sensor.h
+++ b/include/libcamera/internal/camera_sensor.h
@@ -11,7 +11,8 @@
#include <string>
#include <vector>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/controls.h>
#include <libcamera/geometry.h>
#include <libcamera/ipa/core_ipa_interface.h>
diff --git a/include/libcamera/internal/file.h b/include/libcamera/internal/file.h
index f0b313a5..44621ceb 100644
--- a/include/libcamera/internal/file.h
+++ b/include/libcamera/internal/file.h
@@ -11,7 +11,8 @@
#include <string>
#include <sys/types.h>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/span.h>
namespace libcamera {
diff --git a/include/libcamera/internal/log.h b/include/libcamera/internal/log.h
index 9c2beab6..82e55a62 100644
--- a/include/libcamera/internal/log.h
+++ b/include/libcamera/internal/log.h
@@ -10,8 +10,7 @@
#include <chrono>
#include <sstream>
-#include <libcamera/class.h>
-
+#include <libcamera/base/class.h>
#include <libcamera/base/utils.h>
namespace libcamera {
diff --git a/include/libcamera/internal/media_object.h b/include/libcamera/internal/media_object.h
index 1c82c279..2f5d33e1 100644
--- a/include/libcamera/internal/media_object.h
+++ b/include/libcamera/internal/media_object.h
@@ -12,7 +12,7 @@
#include <linux/media.h>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
namespace libcamera {
diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index 31dadf28..8beb6b76 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -15,7 +15,8 @@
#include <sys/types.h>
#include <vector>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/controls.h>
#include <libcamera/object.h>
#include <libcamera/stream.h>
diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h
index d2b9ca55..d07dd6b4 100644
--- a/include/libcamera/internal/v4l2_subdevice.h
+++ b/include/libcamera/internal/v4l2_subdevice.h
@@ -11,7 +11,8 @@
#include <string>
#include <vector>
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/geometry.h>
#include "libcamera/internal/formats.h"
diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h
index 7938343b..227d015e 100644
--- a/include/libcamera/internal/v4l2_videodevice.h
+++ b/include/libcamera/internal/v4l2_videodevice.h
@@ -16,8 +16,9 @@
#include <linux/videodev2.h>
+#include <libcamera/base/class.h>
+
#include <libcamera/buffer.h>
-#include <libcamera/class.h>
#include <libcamera/geometry.h>
#include <libcamera/pixel_format.h>
#include <libcamera/signal.h>