libcamera: Move EventDispatcher to internal API

There's no user of the EventDispatcher (and the related EventNotifier
and Timer classes) outside of libcamera. Move those classes to the
internal API.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

7 files changed, 4 insertions, 8 deletions

diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h
index 6d5341c7..8c8830e7 100644
--- a/include/libcamera/camera_manager.h
+++ b/include/libcamera/camera_manager.h
@@ -19,7 +19,6 @@
 namespace libcamera {
 
 class Camera;
-class EventDispatcher;
 
 class CameraManager : public Object, public Extensible
 {
@@ -43,9 +42,6 @@ public:
 
 	static const std::string &version() { return version_; }
 
-	void setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher);
-	EventDispatcher *eventDispatcher();
-
 	Signal<std::shared_ptr<Camera>> cameraAdded;
 	Signal<std::shared_ptr<Camera>> cameraRemoved;
 
diff --git a/include/libcamera/event_dispatcher.h b/include/libcamera/internal/event_dispatcher.h
index cb06bf20..cb06bf20 100644
--- a/include/libcamera/event_dispatcher.h
+++ b/include/libcamera/internal/event_dispatcher.h
diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h
index 39d9be52..33de051d 100644
--- a/include/libcamera/internal/event_dispatcher_poll.h
+++ b/include/libcamera/internal/event_dispatcher_poll.h
@@ -11,7 +11,7 @@
 #include <map>
 #include <vector>
 
-#include <libcamera/event_dispatcher.h>
+#include "libcamera/internal/event_dispatcher.h"
 
 struct pollfd;
 
diff --git a/include/libcamera/event_notifier.h b/include/libcamera/internal/event_notifier.h
index a37b02ee..a37b02ee 100644
--- a/include/libcamera/event_notifier.h
+++ b/include/libcamera/internal/event_notifier.h
diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build
index 6500fe2a..7cde023f 100644
--- a/include/libcamera/internal/meson.build
+++ b/include/libcamera/internal/meson.build
@@ -18,7 +18,9 @@ libcamera_internal_headers = files([
     'device_enumerator.h',
     'device_enumerator_sysfs.h',
     'device_enumerator_udev.h',
+    'event_dispatcher.h',
     'event_dispatcher_poll.h',
+    'event_notifier.h',
     'file.h',
     'formats.h',
     'ipa_context_wrapper.h',
@@ -36,6 +38,7 @@ libcamera_internal_headers = files([
     'semaphore.h',
     'sysfs.h',
     'thread.h',
+    'timer.h',
     'utils.h',
     'v4l2_controls.h',
     'v4l2_device.h',
diff --git a/include/libcamera/timer.h b/include/libcamera/internal/timer.h
index f55fe3c0..f55fe3c0 100644
--- a/include/libcamera/timer.h
+++ b/include/libcamera/internal/timer.h
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index 0b891a8f..cf2935f1 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -6,8 +6,6 @@ libcamera_public_headers = files([
     'camera.h',
     'camera_manager.h',
     'controls.h',
-    'event_dispatcher.h',
-    'event_notifier.h',
     'extensible.h',
     'file_descriptor.h',
     'framebuffer_allocator.h',
@@ -19,7 +17,6 @@ libcamera_public_headers = files([
     'signal.h',
     'span.h',
     'stream.h',
-    'timer.h',
     'transform.h',
 ])