From b566e97aacd4d4c023526671bafc371ed2eca2c3 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 11 Aug 2019 15:46:59 +0300
Subject: libcamera: camera_manager: Bind CameraManager to threads
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CameraManager class uses the event dispatcher of the current thread.
This makes the CameraManager::eventDispatcher() and
CameraManager::setEventDispatcher() methods inconsistent, as they access
different event dispatcher instances depending on the calling thread.

Fix this by inheriting from the Object class, which binds the
CameraManager to a thread, and use the event dispatcher of the bound
thread.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 include/libcamera/camera_manager.h | 4 +++-
 src/libcamera/camera_manager.cpp   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h
index 0e8881ba..ff7d4c7c 100644
--- a/include/libcamera/camera_manager.h
+++ b/include/libcamera/camera_manager.h
@@ -11,6 +11,8 @@
 #include <string>
 #include <vector>
 
+#include <libcamera/object.h>
+
 namespace libcamera {
 
 class Camera;
@@ -18,7 +20,7 @@ class DeviceEnumerator;
 class EventDispatcher;
 class PipelineHandler;
 
-class CameraManager
+class CameraManager : public Object
 {
 public:
 	int start();
diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 2cf01423..4a880684 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -248,7 +248,7 @@ CameraManager *CameraManager::instance()
  */
 void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher)
 {
-	Thread::current()->setEventDispatcher(std::move(dispatcher));
+	thread()->setEventDispatcher(std::move(dispatcher));
 }
 
 /**
@@ -264,7 +264,7 @@ void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatch
  */
 EventDispatcher *CameraManager::eventDispatcher()
 {
-	return Thread::current()->eventDispatcher();
+	return thread()->eventDispatcher();
 }
 
 } /* namespace libcamera */
-- 
cgit v1.2.1