summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-08-18 03:13:29 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-08-19 19:06:50 +0300
commit5ce4bb62e77e85a681d6742f25e5173963b55415 (patch)
tree1ea3a5a4ffe953ecd87f9b94e608f116c3cffac4
parentfd0087b5d8608eb1dc1e1a3da5ddafd83d43fc79 (diff)
test: camera: Use the CameraManager from the CameraTest base class
Make the camera manager a protected field of the CameraTest class, and use it instead of CameraManager::instance() in the camera tests. This prepares for the removal of CameraManager::instance(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--test/camera/buffer_import.cpp2
-rw-r--r--test/camera/camera_test.h4
-rw-r--r--test/camera/capture.cpp2
3 files changed, 3 insertions, 5 deletions
diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp
index 98786469..9364e3d1 100644
--- a/test/camera/buffer_import.cpp
+++ b/test/camera/buffer_import.cpp
@@ -375,7 +375,7 @@ protected:
return TestFail;
}
- EventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();
+ EventDispatcher *dispatcher = cm_->eventDispatcher();
Timer timer;
timer.start(5000);
diff --git a/test/camera/camera_test.h b/test/camera/camera_test.h
index ffc8a485..e57b05eb 100644
--- a/test/camera/camera_test.h
+++ b/test/camera/camera_test.h
@@ -23,10 +23,8 @@ protected:
int init();
void cleanup();
- std::shared_ptr<Camera> camera_;
-
-private:
CameraManager *cm_;
+ std::shared_ptr<Camera> camera_;
};
#endif /* __LIBCAMERA_CAMERA_TEST_H__ */
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index e6bf7a8d..791ccad1 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -120,7 +120,7 @@ protected:
}
}
- EventDispatcher *dispatcher = CameraManager::instance()->eventDispatcher();
+ EventDispatcher *dispatcher = cm_->eventDispatcher();
Timer timer;
timer.start(1000);