From bcab244b1f11d5839c002e2bccc00b304ac824b0 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 23 Jul 2021 03:41:56 +0300
Subject: libcamera: pipeline_handler: Move CameraData members to
 Camera::Private
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With pipeline handlers now being able to subclass Camera::Private, start
the migration from CameraData to Camera::Private by moving the members
of the base CameraData class. The controlInfo_, properties_ and pipe_
members are duplicated for now, to allow migrating pipeline handlers one
by one.

The Camera::Private class is now properly documented, don't exclude it
from documentation generation.

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>
---
 include/libcamera/internal/camera.h           | 9 +++++++++
 include/libcamera/internal/pipeline_handler.h | 6 +-----
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/libcamera/internal/camera.h b/include/libcamera/internal/camera.h
index 9ec8321a..1a08da0c 100644
--- a/include/libcamera/internal/camera.h
+++ b/include/libcamera/internal/camera.h
@@ -8,6 +8,7 @@
 #define __LIBCAMERA_INTERNAL_CAMERA_H__
 
 #include <atomic>
+#include <list>
 #include <memory>
 #include <set>
 #include <string>
@@ -29,6 +30,14 @@ public:
 	Private(PipelineHandler *pipe);
 	~Private();
 
+	PipelineHandler *pipe() { return pipe_.get(); }
+
+	std::list<Request *> queuedRequests_;
+	ControlInfoMap controlInfo_;
+	ControlList properties_;
+
+	uint32_t requestSequence_;
+
 private:
 	enum State {
 		CameraAvailable,
diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index 9e2d65d6..24b0c5ca 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -7,7 +7,6 @@
 #ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
 #define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
 
-#include <list>
 #include <map>
 #include <memory>
 #include <set>
@@ -39,18 +38,15 @@ class CameraData
 {
 public:
 	explicit CameraData(PipelineHandler *pipe)
-		: pipe_(pipe), requestSequence_(0)
+		: pipe_(pipe)
 	{
 	}
 	virtual ~CameraData() = default;
 
 	PipelineHandler *pipe_;
-	std::list<Request *> queuedRequests_;
 	ControlInfoMap controlInfo_;
 	ControlList properties_;
 
-	uint32_t requestSequence_;
-
 private:
 	LIBCAMERA_DISABLE_COPY(CameraData)
 };
-- 
cgit v1.2.1