From d767c84022559e55708f24a3a264853c0142135e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 8 Nov 2020 01:14:38 +0200 Subject: libcamera: Move EventDispatcher to internal API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- test/camera/buffer_import.cpp | 5 ++--- test/camera/capture.cpp | 4 ++-- test/event-dispatcher.cpp | 5 ++--- test/event-thread.cpp | 5 ++--- test/event.cpp | 7 +++---- test/hotplug-cameras.cpp | 4 ++-- test/ipa/ipa_interface_test.cpp | 6 +++--- test/ipc/unixsocket.cpp | 5 ++--- test/log/log_process.cpp | 4 ++-- test/object-invoke.cpp | 2 +- test/process/process_test.cpp | 5 ++--- test/timer-thread.cpp | 5 ++--- test/timer.cpp | 5 ++--- test/v4l2_videodevice/buffer_sharing.cpp | 4 ++-- test/v4l2_videodevice/capture_async.cpp | 4 ++-- test/v4l2_videodevice/v4l2_m2mdevice.cpp | 4 ++-- 16 files changed, 33 insertions(+), 41 deletions(-) (limited to 'test') diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index ccf532d7..7ff62826 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -12,12 +12,11 @@ #include #include -#include -#include - #include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/v4l2_videodevice.h" #include "buffer_source.h" diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index fd5292b7..6d564fe4 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -7,11 +7,11 @@ #include -#include #include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "camera_test.h" #include "test.h" diff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp index 1b617786..8ae05ac6 100644 --- a/test/event-dispatcher.cpp +++ b/test/event-dispatcher.cpp @@ -10,10 +10,9 @@ #include #include -#include -#include - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/event-thread.cpp b/test/event-thread.cpp index c90e6ac0..aeb8b3bf 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -10,10 +10,9 @@ #include #include -#include -#include - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/event.cpp b/test/event.cpp index c865092c..1f16c97b 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -9,11 +9,10 @@ #include #include -#include -#include -#include - +#include "libcamera/internal/event_dispatcher.h" +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp index 7d551eeb..94cb8593 100644 --- a/test/hotplug-cameras.cpp +++ b/test/hotplug-cameras.cpp @@ -13,11 +13,11 @@ #include #include -#include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/file.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 67488409..9f575f93 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -12,16 +12,16 @@ #include #include -#include -#include #include -#include #include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/event_dispatcher.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" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index 9cd07ce8..19a1d7dd 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -15,11 +15,10 @@ #include #include -#include -#include - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipc_unixsocket.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" #include "test.h" diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index 2a826222..c0a1a012 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -14,13 +14,13 @@ #include #include -#include #include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/log.h" #include "libcamera/internal/process.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" #include "test.h" diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index f3fd2328..a6f816f3 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -8,9 +8,9 @@ #include #include -#include #include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" #include "test.h" diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index a3eaef80..1279d8c1 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -9,11 +9,10 @@ #include #include -#include -#include - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/process.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" #include "test.h" diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index f794d8e7..be29eee1 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -8,10 +8,9 @@ #include #include -#include -#include - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/timer.cpp b/test/timer.cpp index 537489d7..fc90b110 100644 --- a/test/timer.cpp +++ b/test/timer.cpp @@ -8,10 +8,9 @@ #include #include -#include -#include - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index 5e7e2d97..c75259be 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -13,10 +13,10 @@ #include #include -#include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index 2b38102e..accdb34a 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -8,10 +8,10 @@ #include #include -#include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index 616261e1..e0f06808 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -8,12 +8,12 @@ #include #include -#include -#include #include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/v4l2_videodevice.h" #include "test.h" -- cgit v1.2.1