From a27057fc503de6b8e1fb67bfe704dba80b51bfd8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 8 Nov 2020 01:20:13 +0200 Subject: test: Get event dispatcher from current thread MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Get the event dispatcher from the current thread instead of the camera manager. This prepares for the removal of CameraManager::eventDispatcher(). Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- test/camera/buffer_import.cpp | 3 ++- test/camera/capture.cpp | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 4b626dff..ccf532d7 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -17,6 +17,7 @@ #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/media_device.h" +#include "libcamera/internal/thread.h" #include "libcamera/internal/v4l2_videodevice.h" #include "buffer_source.h" @@ -131,7 +132,7 @@ protected: } } - EventDispatcher *dispatcher = cm_->eventDispatcher(); + EventDispatcher *dispatcher = Thread::current()->eventDispatcher(); Timer timer; timer.start(1000); diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index f13ca53b..fd5292b7 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -11,6 +11,8 @@ #include #include +#include "libcamera/internal/thread.h" + #include "camera_test.h" #include "test.h" @@ -131,7 +133,7 @@ protected: } } - EventDispatcher *dispatcher = cm_->eventDispatcher(); + EventDispatcher *dispatcher = Thread::current()->eventDispatcher(); Timer timer; timer.start(1000); -- cgit v1.2.1