diff options
author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-12-15 16:41:11 +0100 |
---|---|---|
committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-12-28 14:02:13 +0100 |
commit | 6ef7eddfd4833095d5ad93e523c414fab66aff90 (patch) | |
tree | 6cd5651e42b192495ecfe74bdf9d8c530f88136a | |
parent | 8992b3ffbba91b092945193c92fca38b5a24154a (diff) |
libcamera: pipeline_handler: Remove Camera pointer from CameraData
There are no users left of this field, drop it.
Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r-- | include/libcamera/internal/pipeline_handler.h | 1 | ||||
-rw-r--r-- | src/libcamera/pipeline_handler.cpp | 11 |
2 files changed, 0 insertions, 12 deletions
diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 5f9a26be..0748f863 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -42,7 +42,6 @@ public: } virtual ~CameraData() = default; - Camera *camera_; PipelineHandler *pipe_; std::list<Request *> queuedRequests_; ControlInfoMap controlInfo_; diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 26d6c07d..c2604d45 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -61,16 +61,6 @@ LOG_DEFINE_CATEGORY(Pipeline) */ /** - * \var CameraData::camera_ - * \brief The camera related to this CameraData instance - * - * The camera_ pointer provides access to the Camera object that this instance - * is related to. It is set when the Camera is registered with - * PipelineHandler::registerCamera() and remains valid until the CameraData - * instance is destroyed. - */ - -/** * \var CameraData::pipe_ * \brief The pipeline handler related to this CameraData instance * @@ -493,7 +483,6 @@ void PipelineHandler::completeRequest(Request *request) void PipelineHandler::registerCamera(std::shared_ptr<Camera> camera, std::unique_ptr<CameraData> data) { - data->camera_ = camera.get(); cameraData_[camera.get()] = std::move(data); cameras_.push_back(camera); |