From 856a4a25278ce5e4b64497deaa3b20c4df16fdee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= Date: Sun, 12 Jan 2020 01:10:51 +0100 Subject: libcamera: request: remove prepare() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The association of buffers to a request can be done directly in addBuffer() instead of when the request is queued to the camera. Keep the check that a request contains buffers by moving it to Camera::queueRequest() where prepare() was previously called. As a bonus we can remove a friend statement in Request. Signed-off-by: Niklas Söderlund Reviewed-by: Laurent Pinchart --- include/libcamera/request.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/libcamera/request.h b/include/libcamera/request.h index 2d5a5964..728f380d 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -48,10 +48,8 @@ public: bool hasPendingBuffers() const { return !pending_.empty(); } private: - friend class Camera; friend class PipelineHandler; - int prepare(); void complete(); bool completeBuffer(Buffer *buffer); -- cgit v1.2.1