summaryrefslogtreecommitdiff
path: root/include/libcamera/internal/pipeline_handler.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-07-23 03:41:56 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-08-16 23:57:28 +0300
commitbcab244b1f11d5839c002e2bccc00b304ac824b0 (patch)
treec6eb3d3a9e65ede14a17a1aab40d6b8ade0c3560 /include/libcamera/internal/pipeline_handler.h
parent32b8832e38e5311dcbed5badfad3d69e5981ed95 (diff)
libcamera: pipeline_handler: Move CameraData members to Camera::Private
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>
Diffstat (limited to 'include/libcamera/internal/pipeline_handler.h')
-rw-r--r--include/libcamera/internal/pipeline_handler.h6
1 files changed, 1 insertions, 5 deletions
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)
};