From ddd267c348b018dc330665539aa573b32c4f6b6e Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Fri, 23 Jul 2021 05:01:53 +0300
Subject: libcamera: pipeline_handler: Drop CameraData class
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The CameraData class isn't used anymore. Drop it.

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/pipeline_handler.h | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

(limited to 'include')

diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h
index 24b0c5ca..1e48f707 100644
--- a/include/libcamera/internal/pipeline_handler.h
+++ b/include/libcamera/internal/pipeline_handler.h
@@ -7,14 +7,12 @@
 #ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
 #define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
 
-#include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <sys/types.h>
 #include <vector>
 
-#include <libcamera/base/class.h>
 #include <libcamera/base/object.h>
 
 #include <libcamera/controls.h>
@@ -34,23 +32,6 @@ class MediaDevice;
 class PipelineHandler;
 class Request;
 
-class CameraData
-{
-public:
-	explicit CameraData(PipelineHandler *pipe)
-		: pipe_(pipe)
-	{
-	}
-	virtual ~CameraData() = default;
-
-	PipelineHandler *pipe_;
-	ControlInfoMap controlInfo_;
-	ControlList properties_;
-
-private:
-	LIBCAMERA_DISABLE_COPY(CameraData)
-};
-
 class PipelineHandler : public std::enable_shared_from_this<PipelineHandler>,
 			public Object
 {
@@ -87,15 +68,11 @@ public:
 	const char *name() const { return name_; }
 
 protected:
-	void registerCamera(std::shared_ptr<Camera> camera,
-			    std::unique_ptr<CameraData> data);
+	void registerCamera(std::shared_ptr<Camera> camera);
 	void hotplugMediaDevice(MediaDevice *media);
 
 	virtual int queueRequestDevice(Camera *camera, Request *request) = 0;
 
-	CameraData *cameraData(const Camera *camera);
-	const CameraData *cameraData(const Camera *camera) const;
-
 	CameraManager *manager_;
 
 private:
@@ -104,7 +81,6 @@ private:
 
 	std::vector<std::shared_ptr<MediaDevice>> mediaDevices_;
 	std::vector<std::weak_ptr<Camera>> cameras_;
-	std::map<const Camera *, std::unique_ptr<CameraData>> cameraData_;
 
 	const char *name_;
 
-- 
cgit v1.2.1