diff options
-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 | ||||
-rw-r--r-- | src/ipa/vimc/vimc.cpp | 4 | ||||
-rw-r--r-- | src/libcamera/base/file.cpp (renamed from src/libcamera/file.cpp) | 4 | ||||
-rw-r--r-- | src/libcamera/base/meson.build | 1 | ||||
-rw-r--r-- | src/libcamera/ipa_manager.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/ipa_module.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/meson.build | 1 | ||||
-rw-r--r-- | src/libcamera/sysfs.cpp | 3 | ||||
-rw-r--r-- | test/file.cpp | 2 | ||||
-rw-r--r-- | test/hotplug-cameras.cpp | 3 |
12 files changed, 15 insertions, 18 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', diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index e44765af..2f575853 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 <libcamera/ipa/vimc_ipa_interface.h> #include <fcntl.h> @@ -14,13 +13,12 @@ #include <iostream> +#include <libcamera/base/file.h> #include <libcamera/base/log.h> #include <libcamera/ipa/ipa_interface.h> #include <libcamera/ipa/ipa_module_info.h> -#include "libcamera/internal/file.h" - namespace libcamera { LOG_DEFINE_CATEGORY(IPAVimc) diff --git a/src/libcamera/file.cpp b/src/libcamera/base/file.cpp index def0f60d..073666fa 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 <libcamera/base/file.h> #include <errno.h> #include <fcntl.h> @@ -17,7 +17,7 @@ #include <libcamera/base/log.h> /** - * \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 7a19c67c..fb8ed79a 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 35c72598..b4606c61 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -12,10 +12,10 @@ #include <string.h> #include <sys/types.h> +#include <libcamera/base/file.h> #include <libcamera/base/log.h> #include <libcamera/base/utils.h> -#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 7ab55579..984c1fed 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -23,10 +23,10 @@ #include <libcamera/span.h> +#include <libcamera/base/file.h> #include <libcamera/base/log.h> #include <libcamera/base/utils.h> -#include "libcamera/internal/file.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index e915266a..36f6ddd7 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 4372b134..44c3331b 100644 --- a/src/libcamera/sysfs.cpp +++ b/src/libcamera/sysfs.cpp @@ -12,10 +12,9 @@ #include <sys/stat.h> #include <sys/sysmacros.h> +#include <libcamera/base/file.h> #include <libcamera/base/log.h> -#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 b80667ae..d768e323 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -13,7 +13,7 @@ #include <sys/types.h> #include <unistd.h> -#include "libcamera/internal/file.h" +#include <libcamera/base/file.h> #include "test.h" diff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp index bb160537..df560403 100644 --- a/test/hotplug-cameras.cpp +++ b/test/hotplug-cameras.cpp @@ -15,11 +15,10 @@ #include <libcamera/camera_manager.h> #include <libcamera/base/event_dispatcher.h> +#include <libcamera/base/file.h> #include <libcamera/base/thread.h> #include <libcamera/base/timer.h> -#include "libcamera/internal/file.h" - #include "test.h" using namespace libcamera; |