Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-16 17:05:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: pipeline_handler: Drop CameraData class

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2021-07-23 05:01:53 +03:00
parent 42808665a0
commit ddd267c348
8 changed files with 9 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/libcamera/internal/pipeline_handler.h
View file

@ -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_;