From b304bc013ef8022131ef0a146f20c6bad7ac45d5 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 16 Jun 2021 10:34:07 +0100 Subject: [PATCH] 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 Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- include/libcamera/{internal => base}/file.h | 9 +++++---- include/libcamera/base/meson.build | 1 + include/libcamera/internal/meson.build | 1 - src/ipa/vimc/vimc.cpp | 4 +--- src/libcamera/{ => base}/file.cpp | 4 ++-- src/libcamera/base/meson.build | 1 + src/libcamera/ipa_manager.cpp | 2 +- src/libcamera/ipa_module.cpp | 2 +- src/libcamera/meson.build | 1 - src/libcamera/sysfs.cpp | 3 +-- test/file.cpp | 2 +- test/hotplug-cameras.cpp | 3 +-- 12 files changed, 15 insertions(+), 18 deletions(-) rename include/libcamera/{internal => base}/file.h (91%) rename src/libcamera/{ => base}/file.cpp (99%) diff --git a/include/libcamera/internal/file.h b/include/libcamera/base/file.h similarity index 91% rename from include/libcamera/internal/file.h rename to include/libcamera/base/file.h index 44621ceb4..5cd985792 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 #include #include -#include #include @@ -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 7a858dcb6..6fc6c138a 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 cf664fc9c..60e9775b5 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', diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index e44765af7..2f5758539 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -4,7 +4,6 @@ * * ipa_vimc.cpp - Vimc Image Processing Algorithm module */ - #include #include @@ -14,13 +13,12 @@ #include +#include #include #include #include -#include "libcamera/internal/file.h" - namespace libcamera { LOG_DEFINE_CATEGORY(IPAVimc) diff --git a/src/libcamera/file.cpp b/src/libcamera/base/file.cpp similarity index 99% rename from src/libcamera/file.cpp rename to src/libcamera/base/file.cpp index def0f60d0..073666fa6 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/base/file.cpp @@ -5,7 +5,7 @@ * file.cpp - File I/O operations */ -#include "libcamera/internal/file.h" +#include #include #include @@ -17,7 +17,7 @@ #include /** - * \file file.h + * \file base/file.h * \brief File I/O operations */ diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 7a19c67c5..fb8ed79ac 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -5,6 +5,7 @@ libcamera_base_sources = files([ 'bound_method.cpp', 'event_dispatcher.cpp', 'event_dispatcher_poll.cpp', + 'file.cpp', 'log.cpp', 'message.cpp', 'object.cpp', diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 35c725980..b4606c615 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -12,10 +12,10 @@ #include #include +#include #include #include -#include "libcamera/internal/file.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipa_proxy.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 7ab555791..984c1fed9 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -23,10 +23,10 @@ #include +#include #include #include -#include "libcamera/internal/file.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index e915266a9..36f6ddd7f 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -16,7 +16,6 @@ libcamera_sources = files([ 'device_enumerator.cpp', 'device_enumerator_sysfs.cpp', 'event_notifier.cpp', - 'file.cpp', 'file_descriptor.cpp', 'formats.cpp', 'framebuffer_allocator.cpp', diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp index 4372b1348..44c3331b4 100644 --- a/src/libcamera/sysfs.cpp +++ b/src/libcamera/sysfs.cpp @@ -12,10 +12,9 @@ #include #include +#include #include -#include "libcamera/internal/file.h" - /** * \file sysfs.h * \brief Miscellaneous utility functions to access sysfs diff --git a/test/file.cpp b/test/file.cpp index b80667ae5..d768e3235 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -13,7 +13,7 @@ #include #include -#include "libcamera/internal/file.h" +#include #include "test.h" diff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp index bb160537c..df5604035 100644 --- a/test/hotplug-cameras.cpp +++ b/test/hotplug-cameras.cpp @@ -15,11 +15,10 @@ #include #include +#include #include #include -#include "libcamera/internal/file.h" - #include "test.h" using namespace libcamera;