PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: pipeline_handler: Reorder member declaration order

Browse Source 
Reorder the member declaration order in the PipelineHandler class to
match the control flow order, and to declare variables after methods
according to the coding style. Update the documentation accordingly,
preserving the order within the public, protected and private sections,
but grouping related methods together between the sections.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2019-02-09 00:09:13 +02:00
parent fd38fa66c3
commit d8f2ed7d0d
2 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcamera/include/pipeline_handler.h
View File

@@ -42,6 +42,8 @@ public:
PipelineHandler(CameraManager *manager);
virtual ~PipelineHandler();
virtual bool match(DeviceEnumerator *enumerator) = 0;
virtual std::map<Stream *, StreamConfiguration>
streamConfiguration(Camera *camera, std::vector<Stream *> &streams) = 0;
virtual int configureStreams(Camera *camera,
@@ -55,20 +57,18 @@ public:
virtual int queueRequest(const Camera *camera, Request *request) = 0;
virtual bool match(DeviceEnumerator *enumerator) = 0;
protected:
CameraManager *manager_;
void registerCamera(std::shared_ptr<Camera> camera);
void hotplugMediaDevice(MediaDevice *media);
CameraData *cameraData(const Camera *camera);
void setCameraData(const Camera *camera, std::unique_ptr<CameraData> data);
CameraManager *manager_;
private:
virtual void disconnect();
void mediaDeviceDisconnected(MediaDevice *media);
virtual void disconnect();
std::vector<std::weak_ptr<Camera>> cameras_;
std::map<const Camera *, std::unique_ptr<CameraData>> cameraData_;