libcamera/base: Move event_notifier to base

Move the event notifier, and associated header updates.

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>

9 files changed, 10 insertions, 13 deletions

diff --git a/src/libcamera/base/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp
index d76ca7fc..5839373a 100644
--- a/src/libcamera/base/event_dispatcher_poll.cpp
+++ b/src/libcamera/base/event_dispatcher_poll.cpp
@@ -16,13 +16,12 @@
 #include <sys/eventfd.h>
 #include <unistd.h>
 
+#include <libcamera/base/event_notifier.h>
 #include <libcamera/base/log.h>
 #include <libcamera/base/thread.h>
 #include <libcamera/base/timer.h>
 #include <libcamera/base/utils.h>
 
-#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
index 784016a9..fd93c087 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 <libcamera/camera_manager.h>
+#include <libcamera/base/event_notifier.h>
 
 #include <libcamera/base/event_dispatcher.h>
 #include <libcamera/base/message.h>
 #include <libcamera/base/thread.h>
 
+#include <libcamera/camera_manager.h>
+
 /**
  * \file event_notifier.h
  * \brief File descriptor event notifier
diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build
index fb8ed79a..a8b04cfc 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 4b842773..37a2c5aa 100644
--- a/src/libcamera/device_enumerator_udev.cpp
+++ b/src/libcamera/device_enumerator_udev.cpp
@@ -17,9 +17,9 @@
 #include <sys/sysmacros.h>
 #include <unistd.h>
 
+#include <libcamera/base/event_notifier.h>
 #include <libcamera/base/log.h>
 
-#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 14665970..f23eb783 100644
--- a/src/libcamera/ipc_unixsocket.cpp
+++ b/src/libcamera/ipc_unixsocket.cpp
@@ -12,10 +12,9 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
+#include <libcamera/base/event_notifier.h>
 #include <libcamera/base/log.h>
 
-#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 36f6ddd7..e0c47352 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 46338029..4fe4ad57 100644
--- a/src/libcamera/process.cpp
+++ b/src/libcamera/process.cpp
@@ -20,11 +20,10 @@
 #include <unistd.h>
 #include <vector>
 
+#include <libcamera/base/event_notifier.h>
 #include <libcamera/base/log.h>
 #include <libcamera/base/utils.h>
 
-#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 334b9b78..98d93a12 100644
--- a/src/libcamera/v4l2_device.cpp
+++ b/src/libcamera/v4l2_device.cpp
@@ -16,10 +16,10 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
+#include <libcamera/base/event_notifier.h>
 #include <libcamera/base/log.h>
 #include <libcamera/base/utils.h>
 
-#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 dc23510b..3d2d99b4 100644
--- a/src/libcamera/v4l2_videodevice.cpp
+++ b/src/libcamera/v4l2_videodevice.cpp
@@ -21,11 +21,11 @@
 
 #include <linux/version.h>
 
+#include <libcamera/base/event_notifier.h>
 #include <libcamera/base/log.h>
 
 #include <libcamera/file_descriptor.h>
 
-#include "libcamera/internal/event_notifier.h"
 #include "libcamera/internal/media_device.h"
 #include "libcamera/internal/media_object.h"