summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-11-08 01:20:13 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-11-15 22:21:21 +0200
commita27057fc503de6b8e1fb67bfe704dba80b51bfd8 (patch)
tree2f8933e710761e60161871694b27fa0b24065d6d
parent2d50b1664508e86e4d27b8620e74f8e82dfe1d57 (diff)
test: Get event dispatcher from current thread
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 <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--test/camera/buffer_import.cpp3
-rw-r--r--test/camera/capture.cpp4
2 files changed, 5 insertions, 2 deletions
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 <libcamera/framebuffer_allocator.h>
#include <libcamera/timer.h>
+#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);