diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-08-18 03:13:29 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-08-19 19:06:50 +0300 |
| commit | 5ce4bb62e77e85a681d6742f25e5173963b55415 (patch) | |
| tree | 1ea3a5a4ffe953ecd87f9b94e608f116c3cffac4 /test/camera/camera_test.h | |
| parent | fd0087b5d8608eb1dc1e1a3da5ddafd83d43fc79 (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>
Diffstat (limited to 'test/camera/camera_test.h')
| -rw-r--r-- | test/camera/camera_test.h | 4 |
1 files changed, 1 insertions, 3 deletions
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__ */ |