From f9ee72430735f749fb7d8fd4a8fe01ca88dc1f88 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Fri, 25 Jun 2021 02:06:55 +0100 Subject: [PATCH] libcamera/base: Move event_notifier to base Move the event notifier, and associated header updates. Reviewed-by: Hirokazu Honda Reviewed-by: Paul Elder Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- include/libcamera/{internal => base}/event_notifier.h | 6 +++--- include/libcamera/base/meson.build | 1 + include/libcamera/internal/meson.build | 1 - src/libcamera/base/event_dispatcher_poll.cpp | 3 +-- src/libcamera/{ => base}/event_notifier.cpp | 6 +++--- src/libcamera/base/meson.build | 1 + src/libcamera/device_enumerator_udev.cpp | 2 +- src/libcamera/ipc_unixsocket.cpp | 3 +-- src/libcamera/meson.build | 1 - src/libcamera/process.cpp | 3 +-- src/libcamera/v4l2_device.cpp | 2 +- src/libcamera/v4l2_videodevice.cpp | 2 +- test/event-thread.cpp | 3 +-- test/event.cpp | 3 +-- test/ipa/ipa_interface_test.cpp | 2 +- 15 files changed, 17 insertions(+), 22 deletions(-) rename include/libcamera/{internal => base}/event_notifier.h (83%) rename src/libcamera/{ => base}/event_notifier.cpp (98%) diff --git a/include/libcamera/internal/event_notifier.h b/include/libcamera/base/event_notifier.h similarity index 83% rename from include/libcamera/internal/event_notifier.h rename to include/libcamera/base/event_notifier.h index 8a6419f23..5aa2784aa 100644 --- a/include/libcamera/internal/event_notifier.h +++ b/include/libcamera/base/event_notifier.h @@ -4,8 +4,8 @@ * * event_notifier.h - File descriptor event notifier */ -#ifndef __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ -#define __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ +#ifndef __LIBCAMERA_BASE_EVENT_NOTIFIER_H__ +#define __LIBCAMERA_BASE_EVENT_NOTIFIER_H__ #include #include @@ -45,4 +45,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ */ +#endif /* __LIBCAMERA_BASE_EVENT_NOTIFIER_H__ */ diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index 6fc6c138a..83c664aff 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', + 'event_notifier.h', 'file.h', 'log.h', 'message.h', diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 60e9775b5..16a76ebdf 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -22,7 +22,6 @@ libcamera_internal_headers = files([ 'device_enumerator.h', 'device_enumerator_sysfs.h', 'device_enumerator_udev.h', - 'event_notifier.h', 'formats.h', 'ipa_manager.h', 'ipa_module.h', diff --git a/src/libcamera/base/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp index d76ca7fc2..5839373a5 100644 --- a/src/libcamera/base/event_dispatcher_poll.cpp +++ b/src/libcamera/base/event_dispatcher_poll.cpp @@ -16,13 +16,12 @@ #include #include +#include #include #include #include #include -#include "libcamera/internal/event_notifier.h" - /** * \file base/event_dispatcher_poll.h */ diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/base/event_notifier.cpp similarity index 98% rename from src/libcamera/event_notifier.cpp rename to src/libcamera/base/event_notifier.cpp index 784016a9f..fd93c0878 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/base/event_notifier.cpp @@ -5,14 +5,14 @@ * event_notifier.cpp - File descriptor event notifier */ -#include "libcamera/internal/event_notifier.h" - -#include +#include #include #include #include +#include + /** * \file event_notifier.h * \brief File descriptor event notifier diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index fb8ed79ac..a8b04cfc8 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', + 'event_notifier.cpp', 'file.cpp', 'log.cpp', 'message.cpp', diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index 4b842773f..37a2c5aa5 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -17,9 +17,9 @@ #include #include +#include #include -#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp index 146659707..f23eb783b 100644 --- a/src/libcamera/ipc_unixsocket.cpp +++ b/src/libcamera/ipc_unixsocket.cpp @@ -12,10 +12,9 @@ #include #include +#include #include -#include "libcamera/internal/event_notifier.h" - /** * \file ipc_unixsocket.h * \brief IPC mechanism based on Unix sockets diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 36f6ddd7f..e0c473521 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -15,7 +15,6 @@ libcamera_sources = files([ 'delayed_controls.cpp', 'device_enumerator.cpp', 'device_enumerator_sysfs.cpp', - 'event_notifier.cpp', 'file_descriptor.cpp', 'formats.cpp', 'framebuffer_allocator.cpp', diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp index 463380299..4fe4ad570 100644 --- a/src/libcamera/process.cpp +++ b/src/libcamera/process.cpp @@ -20,11 +20,10 @@ #include #include +#include #include #include -#include "libcamera/internal/event_notifier.h" - /** * \file process.h * \brief Process object diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index 334b9b78b..98d93a12a 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -16,10 +16,10 @@ #include #include +#include #include #include -#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/sysfs.h" /** diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index dc23510bc..3d2d99b46 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -21,11 +21,11 @@ #include +#include #include #include -#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" diff --git a/test/event-thread.cpp b/test/event-thread.cpp index 05c5d26d3..575261664 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -10,11 +10,10 @@ #include #include +#include #include #include -#include "libcamera/internal/event_notifier.h" - #include "test.h" using namespace std; diff --git a/test/event.cpp b/test/event.cpp index aa79da99c..c2274344b 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -10,11 +10,10 @@ #include #include +#include #include #include -#include "libcamera/internal/event_notifier.h" - #include "test.h" using namespace std; diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 656d86552..ee9f26510 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -15,11 +15,11 @@ #include #include +#include #include #include #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h"