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 --- include/libcamera/camera_manager.h | 4 -- include/libcamera/event_dispatcher.h | 35 ---------------- include/libcamera/event_notifier.h | 48 --------------------- include/libcamera/internal/event_dispatcher.h | 35 ++++++++++++++++ include/libcamera/internal/event_dispatcher_poll.h | 2 +- include/libcamera/internal/event_notifier.h | 48 +++++++++++++++++++++ include/libcamera/internal/meson.build | 3 ++ include/libcamera/internal/timer.h | 49 ++++++++++++++++++++++ include/libcamera/meson.build | 3 -- include/libcamera/timer.h | 49 ---------------------- src/libcamera/camera_manager.cpp | 44 +------------------ src/libcamera/device_enumerator_udev.cpp | 3 +- src/libcamera/event_dispatcher.cpp | 2 +- src/libcamera/event_dispatcher_poll.cpp | 5 +-- src/libcamera/event_notifier.cpp | 4 +- src/libcamera/ipc_unixsocket.cpp | 3 +- src/libcamera/pipeline/rkisp1/timeline.h | 3 +- src/libcamera/process.cpp | 3 +- .../proxy/worker/ipa_proxy_linux_worker.cpp | 2 +- src/libcamera/thread.cpp | 3 +- src/libcamera/timer.cpp | 4 +- src/libcamera/v4l2_device.cpp | 3 +- src/libcamera/v4l2_videodevice.cpp | 2 +- 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 +- 39 files changed, 186 insertions(+), 245 deletions(-) delete mode 100644 include/libcamera/event_dispatcher.h delete mode 100644 include/libcamera/event_notifier.h create mode 100644 include/libcamera/internal/event_dispatcher.h create mode 100644 include/libcamera/internal/event_notifier.h create mode 100644 include/libcamera/internal/timer.h delete mode 100644 include/libcamera/timer.h 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 dispatcher); - EventDispatcher *eventDispatcher(); - Signal> cameraAdded; Signal> cameraRemoved; diff --git a/include/libcamera/event_dispatcher.h b/include/libcamera/event_dispatcher.h deleted file mode 100644 index cb06bf20..00000000 --- a/include/libcamera/event_dispatcher.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_dispatcher.h - Event dispatcher - */ -#ifndef __LIBCAMERA_EVENT_DISPATCHER_H__ -#define __LIBCAMERA_EVENT_DISPATCHER_H__ - -#include - -namespace libcamera { - -class EventNotifier; -class Timer; - -class EventDispatcher -{ -public: - virtual ~EventDispatcher(); - - virtual void registerEventNotifier(EventNotifier *notifier) = 0; - virtual void unregisterEventNotifier(EventNotifier *notifier) = 0; - - virtual void registerTimer(Timer *timer) = 0; - virtual void unregisterTimer(Timer *timer) = 0; - - virtual void processEvents() = 0; - - virtual void interrupt() = 0; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_EVENT_DISPATCHER_H__ */ diff --git a/include/libcamera/event_notifier.h b/include/libcamera/event_notifier.h deleted file mode 100644 index a37b02ee..00000000 --- a/include/libcamera/event_notifier.h +++ /dev/null @@ -1,48 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_notifier.h - File descriptor event notifier - */ -#ifndef __LIBCAMERA_EVENT_NOTIFIER_H__ -#define __LIBCAMERA_EVENT_NOTIFIER_H__ - -#include -#include - -namespace libcamera { - -class Message; - -class EventNotifier : public Object -{ -public: - enum Type { - Read, - Write, - Exception, - }; - - EventNotifier(int fd, Type type, Object *parent = nullptr); - virtual ~EventNotifier(); - - Type type() const { return type_; } - int fd() const { return fd_; } - - bool enabled() const { return enabled_; } - void setEnabled(bool enable); - - Signal activated; - -protected: - void message(Message *msg) override; - -private: - int fd_; - Type type_; - bool enabled_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_EVENT_NOTIFIER_H__ */ diff --git a/include/libcamera/internal/event_dispatcher.h b/include/libcamera/internal/event_dispatcher.h new file mode 100644 index 00000000..cb06bf20 --- /dev/null +++ b/include/libcamera/internal/event_dispatcher.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_dispatcher.h - Event dispatcher + */ +#ifndef __LIBCAMERA_EVENT_DISPATCHER_H__ +#define __LIBCAMERA_EVENT_DISPATCHER_H__ + +#include + +namespace libcamera { + +class EventNotifier; +class Timer; + +class EventDispatcher +{ +public: + virtual ~EventDispatcher(); + + virtual void registerEventNotifier(EventNotifier *notifier) = 0; + virtual void unregisterEventNotifier(EventNotifier *notifier) = 0; + + virtual void registerTimer(Timer *timer) = 0; + virtual void unregisterTimer(Timer *timer) = 0; + + virtual void processEvents() = 0; + + virtual void interrupt() = 0; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_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 #include -#include +#include "libcamera/internal/event_dispatcher.h" struct pollfd; diff --git a/include/libcamera/internal/event_notifier.h b/include/libcamera/internal/event_notifier.h new file mode 100644 index 00000000..a37b02ee --- /dev/null +++ b/include/libcamera/internal/event_notifier.h @@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * event_notifier.h - File descriptor event notifier + */ +#ifndef __LIBCAMERA_EVENT_NOTIFIER_H__ +#define __LIBCAMERA_EVENT_NOTIFIER_H__ + +#include +#include + +namespace libcamera { + +class Message; + +class EventNotifier : public Object +{ +public: + enum Type { + Read, + Write, + Exception, + }; + + EventNotifier(int fd, Type type, Object *parent = nullptr); + virtual ~EventNotifier(); + + Type type() const { return type_; } + int fd() const { return fd_; } + + bool enabled() const { return enabled_; } + void setEnabled(bool enable); + + Signal activated; + +protected: + void message(Message *msg) override; + +private: + int fd_; + Type type_; + bool enabled_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_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/internal/timer.h b/include/libcamera/internal/timer.h new file mode 100644 index 00000000..f55fe3c0 --- /dev/null +++ b/include/libcamera/internal/timer.h @@ -0,0 +1,49 @@ +/* SPDX-License-Identifier: LGPL-2.1-or-later */ +/* + * Copyright (C) 2019, Google Inc. + * + * timer.h - Generic timer + */ +#ifndef __LIBCAMERA_TIMER_H__ +#define __LIBCAMERA_TIMER_H__ + +#include +#include + +#include +#include + +namespace libcamera { + +class Message; + +class Timer : public Object +{ +public: + Timer(Object *parent = nullptr); + ~Timer(); + + void start(unsigned int msec) { start(std::chrono::milliseconds(msec)); } + void start(std::chrono::milliseconds duration); + void start(std::chrono::steady_clock::time_point deadline); + void stop(); + bool isRunning() const; + + std::chrono::steady_clock::time_point deadline() const { return deadline_; } + + Signal timeout; + +protected: + void message(Message *msg) override; + +private: + void registerTimer(); + void unregisterTimer(); + + bool running_; + std::chrono::steady_clock::time_point deadline_; +}; + +} /* namespace libcamera */ + +#endif /* __LIBCAMERA_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', ]) diff --git a/include/libcamera/timer.h b/include/libcamera/timer.h deleted file mode 100644 index f55fe3c0..00000000 --- a/include/libcamera/timer.h +++ /dev/null @@ -1,49 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * timer.h - Generic timer - */ -#ifndef __LIBCAMERA_TIMER_H__ -#define __LIBCAMERA_TIMER_H__ - -#include -#include - -#include -#include - -namespace libcamera { - -class Message; - -class Timer : public Object -{ -public: - Timer(Object *parent = nullptr); - ~Timer(); - - void start(unsigned int msec) { start(std::chrono::milliseconds(msec)); } - void start(std::chrono::milliseconds duration); - void start(std::chrono::steady_clock::time_point deadline); - void stop(); - bool isRunning() const; - - std::chrono::steady_clock::time_point deadline() const { return deadline_; } - - Signal timeout; - -protected: - void message(Message *msg) override; - -private: - void registerTimer(); - void unregisterTimer(); - - bool running_; - std::chrono::steady_clock::time_point deadline_; -}; - -} /* namespace libcamera */ - -#endif /* __LIBCAMERA_TIMER_H__ */ diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 427ea5da..67641a55 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -11,10 +11,8 @@ #include #include -#include #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher_poll.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" @@ -244,12 +242,8 @@ void CameraManager::Private::removeCamera(Camera *camera) * a time. Attempting to create a second instance without first deleting the * existing instance results in undefined behaviour. * - * The manager is initially stopped, and shall be configured before being - * started. In particular a custom event dispatcher shall be installed if - * needed with CameraManager::setEventDispatcher(). - * - * Once the camera manager is configured, it shall be started with start(). - * This will enumerate all the cameras present in the system, which can then be + * The manager is initially stopped, and shall be started with start(). This + * will enumerate all the cameras present in the system, which can then be * listed with list() and retrieved with get(). * * Cameras are shared through std::shared_ptr<>, ensuring that a camera will @@ -477,38 +471,4 @@ void CameraManager::removeCamera(std::shared_ptr camera) * \return The libcamera version string */ -/** - * \brief Set the event dispatcher - * \param[in] dispatcher Pointer to the event dispatcher - * - * libcamera requires an event dispatcher to integrate event notification and - * timers with the application event loop. Applications that want to provide - * their own event dispatcher shall call this function once and only once before - * the camera manager is started with start(). If no event dispatcher is - * provided, a default poll-based implementation will be used. - * - * The CameraManager takes ownership of the event dispatcher and will delete it - * when the application terminates. - */ -void CameraManager::setEventDispatcher(std::unique_ptr dispatcher) -{ - thread()->setEventDispatcher(std::move(dispatcher)); -} - -/** - * \brief Retrieve the event dispatcher - * - * This function retrieves the event dispatcher set with setEventDispatcher(). - * If no dispatcher has been set, a default poll-based implementation is created - * and returned, and no custom event dispatcher may be installed anymore. - * - * The returned event dispatcher is valid until the camera manager is destroyed. - * - * \return Pointer to the event dispatcher - */ -EventDispatcher *CameraManager::eventDispatcher() -{ - return thread()->eventDispatcher(); -} - } /* namespace libcamera */ diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index c6e23a1a..d26fcf10 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -17,8 +17,7 @@ #include #include -#include - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" diff --git a/src/libcamera/event_dispatcher.cpp b/src/libcamera/event_dispatcher.cpp index 90bd5daf..e0ce1eb3 100644 --- a/src/libcamera/event_dispatcher.cpp +++ b/src/libcamera/event_dispatcher.cpp @@ -5,7 +5,7 @@ * event_dispatcher.cpp - Event dispatcher */ -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/log.h" diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp index 9ab85da7..456c6def 100644 --- a/src/libcamera/event_dispatcher_poll.cpp +++ b/src/libcamera/event_dispatcher_poll.cpp @@ -16,11 +16,10 @@ #include #include -#include -#include - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" /** diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp index 21c07faf..6b0575c0 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/event_notifier.cpp @@ -5,11 +5,11 @@ * event_notifier.cpp - File descriptor event notifier */ -#include +#include "libcamera/internal/event_notifier.h" #include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/message.h" #include "libcamera/internal/thread.h" diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp index 5c8cce16..fdb359f7 100644 --- a/src/libcamera/ipc_unixsocket.cpp +++ b/src/libcamera/ipc_unixsocket.cpp @@ -12,8 +12,7 @@ #include #include -#include - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" /** diff --git a/src/libcamera/pipeline/rkisp1/timeline.h b/src/libcamera/pipeline/rkisp1/timeline.h index 0c37b06f..35a08515 100644 --- a/src/libcamera/pipeline/rkisp1/timeline.h +++ b/src/libcamera/pipeline/rkisp1/timeline.h @@ -10,8 +10,7 @@ #include #include -#include - +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" namespace libcamera { diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp index 72b5afe2..40a434a6 100644 --- a/src/libcamera/process.cpp +++ b/src/libcamera/process.cpp @@ -20,8 +20,7 @@ #include #include -#include - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/utils.h" diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp index 0c4687f7..bdbac988 100644 --- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp +++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp @@ -9,10 +9,10 @@ #include #include -#include #include #include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipc_unixsocket.h" #include "libcamera/internal/log.h" diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp index b5d7103a..f339dab1 100644 --- a/src/libcamera/thread.cpp +++ b/src/libcamera/thread.cpp @@ -14,8 +14,7 @@ #include #include -#include - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/event_dispatcher_poll.h" #include "libcamera/internal/log.h" #include "libcamera/internal/message.h" diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index 24e452ed..c242113a 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -5,13 +5,13 @@ * timer.cpp - Generic timer */ -#include +#include "libcamera/internal/timer.h" #include #include -#include +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/log.h" #include "libcamera/internal/message.h" #include "libcamera/internal/thread.h" diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index fd0b140f..decd19ef 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -16,8 +16,7 @@ #include #include -#include - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/sysfs.h" #include "libcamera/internal/utils.h" diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 5ee1b479..e76fe2dd 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -20,9 +20,9 @@ #include -#include #include +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" 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