libcamera: camera: Pass Private pointer to Camera constructor

In order to allow subclassing Camera::Private in pipeline handlers, pass
the pointer to the private data to the Camera constructor, and to the
Camera::createCamera() function.

The Camera::Private id_ and streams_ members now need to be initialized
by the Camera constructor instead of the Camera::Private constructor, to
allow storage of the streams in a pipeline handler-specific subclass of
Camera::Private.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index b081907e..05cdab72 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -78,7 +78,7 @@ class Camera final : public Object, public std::enable_shared_from_this<Camera>,
 	LIBCAMERA_DECLARE_PRIVATE()
 
 public:
-	static std::shared_ptr<Camera> create(PipelineHandler *pipe,
+	static std::shared_ptr<Camera> create(std::unique_ptr<Private> d,
 					      const std::string &id,
 					      const std::set<Stream *> &streams);
 
@@ -107,7 +107,7 @@ public:
 private:
 	LIBCAMERA_DISABLE_COPY(Camera)
 
-	Camera(PipelineHandler *pipe, const std::string &id,
+	Camera(std::unique_ptr<Private> d, const std::string &id,
 	       const std::set<Stream *> &streams);
 	~Camera();