diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-16 10:34:07 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 16:11:10 +0100 |
| commit | b304bc013ef8022131ef0a146f20c6bad7ac45d5 (patch) | |
| tree | 6ec2d13a59fcb1be0e1c7df9c2187edf607b3a6a /include | |
| parent | 27aff949fbc1b9aabfc594bbfd6f94be55a086ec (diff) | |
libcamera/base: Move File to base library
The File abstraction is a base helper and not part of the libcamera
API. Move it to to allow usage by users of the base library.
Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/libcamera/base/file.h (renamed from include/libcamera/internal/file.h) | 9 | ||||
| -rw-r--r-- | include/libcamera/base/meson.build | 1 | ||||
| -rw-r--r-- | include/libcamera/internal/meson.build | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/include/libcamera/internal/file.h b/include/libcamera/base/file.h index 44621ceb..5cd98579 100644 --- a/include/libcamera/internal/file.h +++ b/include/libcamera/base/file.h @@ -4,12 +4,13 @@ * * file.h - File I/O operations */ -#ifndef __LIBCAMERA_INTERNAL_FILE_H__ -#define __LIBCAMERA_INTERNAL_FILE_H__ +#ifndef __LIBCAMERA_BASE_FILE_H__ +#define __LIBCAMERA_BASE_FILE_H__ + +#include <sys/types.h> #include <map> #include <string> -#include <sys/types.h> #include <libcamera/base/class.h> @@ -75,4 +76,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_FILE_H__ */ +#endif /* __LIBCAMERA_BASE_FILE_H__ */ diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index 7a858dcb..6fc6c138 100644 --- a/include/libcamera/base/meson.build +++ b/include/libcamera/base/meson.build @@ -7,6 +7,7 @@ libcamera_base_headers = files([ 'class.h', 'event_dispatcher.h', 'event_dispatcher_poll.h', + 'file.h', 'log.h', 'message.h', 'object.h', diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index cf664fc9..60e9775b 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -23,7 +23,6 @@ libcamera_internal_headers = files([ 'device_enumerator_sysfs.h', 'device_enumerator_udev.h', 'event_notifier.h', - 'file.h', 'formats.h', 'ipa_manager.h', 'ipa_module.h', |