diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 00:09:15 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 16:11:03 +0100 |
| commit | 6410d1d37c1ea9d1d168840a7ba063facb0bc9d6 (patch) | |
| tree | d23c636895d51df3b4b6fe128f322132203a3a26 /src | |
| parent | cbdc93e9d1666010d49e06940158a37c61cc6fa7 (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 'src')
| -rw-r--r-- | src/android/camera_buffer.h | 3 | ||||
| -rw-r--r-- | src/android/camera_capabilities.h | 3 | ||||
| -rw-r--r-- | src/android/camera_hal_config.h | 2 | ||||
| -rw-r--r-- | src/libcamera/base/class.cpp (renamed from src/libcamera/class.cpp) | 2 | ||||
| -rw-r--r-- | src/libcamera/base/meson.build | 1 | ||||
| -rw-r--r-- | src/libcamera/meson.build | 1 |
6 files changed, 7 insertions, 5 deletions
diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h index c88124b2..e850c4e3 100644 --- a/src/android/camera_buffer.h +++ b/src/android/camera_buffer.h @@ -9,7 +9,8 @@ #include <hardware/camera3.h> -#include <libcamera/class.h> +#include <libcamera/base/class.h> + #include <libcamera/span.h> class CameraBuffer final : public libcamera::Extensible diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h index f511607b..4f5be825 100644 --- a/src/android/camera_capabilities.h +++ b/src/android/camera_capabilities.h @@ -11,8 +11,9 @@ #include <memory> #include <vector> +#include <libcamera/base/class.h> + #include <libcamera/camera.h> -#include <libcamera/class.h> #include <libcamera/formats.h> #include <libcamera/geometry.h> diff --git a/src/android/camera_hal_config.h b/src/android/camera_hal_config.h index 97dc69c1..a79d5d6c 100644 --- a/src/android/camera_hal_config.h +++ b/src/android/camera_hal_config.h @@ -10,7 +10,7 @@ #include <map> #include <string> -#include <libcamera/class.h> +#include <libcamera/base/class.h> struct CameraConfigData { int facing = -1; diff --git a/src/libcamera/class.cpp b/src/libcamera/base/class.cpp index 28c35633..165beafc 100644 --- a/src/libcamera/class.cpp +++ b/src/libcamera/base/class.cpp @@ -5,7 +5,7 @@ * class.cpp - Utilities and helpers for classes */ -#include <libcamera/class.h> +#include <libcamera/base/class.h> /** * \file class.h diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 6d9ec374..302a2886 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -1,6 +1,7 @@ # SPDX-License-Identifier: CC0-1.0 libcamera_base_sources = files([ + 'class.cpp', 'utils.cpp', ]) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index b70688d8..e1252ce4 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -10,7 +10,6 @@ libcamera_sources = files([ 'camera_manager.cpp', 'camera_sensor.cpp', 'camera_sensor_properties.cpp', - 'class.cpp', 'controls.cpp', 'control_serializer.cpp', 'control_validator.cpp', |