summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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);