cam: Move camera acquire to the CameraSession class

Continue moving towards making the CameraSession class the central point
to handle a camera by moving the camera acquire operation. A new
CameraSession::camera() function is needed to allow access to the camera
from CamApp.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h
index 39dbbdf3..88baf906 100644
--- a/src/cam/camera_session.h
+++ b/src/cam/camera_session.h
@@ -14,6 +14,7 @@
 #include <libcamera/base/signal.h>
 
 #include <libcamera/camera.h>
+#include <libcamera/camera_manager.h>
 #include <libcamera/framebuffer.h>
 #include <libcamera/framebuffer_allocator.h>
 #include <libcamera/request.h>
@@ -25,10 +26,13 @@
 class CameraSession
 {
 public:
-	CameraSession(std::shared_ptr<libcamera::Camera> camera,
+	CameraSession(libcamera::CameraManager *cm,
 		      const OptionsParser::Options &options);
+	~CameraSession();
 
 	bool isValid() const { return config_ != nullptr; }
+
+	libcamera::Camera *camera() { return camera_.get(); }
 	libcamera::CameraConfiguration *config() { return config_.get(); }
 
 	int start(const OptionsParser::Options &options);