From 3bd19855459f6b58360197bc67c545a698812899 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Sun, 5 Jan 2020 04:35:25 +0200
Subject: v4l2: camera: Merge getStreamConfig() with open()

The V4L2CameraProxy always calls V4L2Camera::getStreamConfig() right
after V4L2Camera::open(), and never afterwards. Simplify the code by
returning the initial configuration from V4L2Camera::open() and removing
V4L2Camera::getStreamConfig().

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
---
 src/v4l2/v4l2_camera.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/v4l2/v4l2_camera.h')

diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h
index be6c4e18..1fc5ebef 100644
--- a/src/v4l2/v4l2_camera.h
+++ b/src/v4l2/v4l2_camera.h
@@ -37,11 +37,11 @@ public:
 	V4L2Camera(std::shared_ptr<Camera> camera);
 	~V4L2Camera();
 
-	int open();
+	int open(StreamConfiguration *streamConfig);
 	void close();
 	void bind(int efd);
 	void unbind();
-	void getStreamConfig(StreamConfiguration *streamConfig);
+
 	std::vector<Buffer> completedBuffers();
 
 	int configure(StreamConfiguration *streamConfigOut,
-- 
cgit v1.2.1