From d98af71eaa3f28f5e49456dd1e3462e1580463f5 Mon Sep 17 00:00:00 2001 From: Dorota Czaplejewicz Date: Fri, 19 Nov 2021 16:05:58 +0100 Subject: libcamera: framebuffer: Make FrameBuffer::cancel() private FrameBuffer::cancel() is not meant to be used by applications. Move it to the FrameBuffer::Private class. Reviewed-by: Laurent Pinchart Reviewed-by: Kieran Bingham Signed-off-by: Dorota Czaplejewicz [Kieran: Handle rebase] Signed-off-by: Kieran Bingham --- include/libcamera/framebuffer.h | 2 -- include/libcamera/internal/framebuffer.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/libcamera/framebuffer.h b/include/libcamera/framebuffer.h index de172d97..3b1118d1 100644 --- a/include/libcamera/framebuffer.h +++ b/include/libcamera/framebuffer.h @@ -71,8 +71,6 @@ public: std::unique_ptr releaseFence(); - void cancel() { metadata_.status = FrameMetadata::FrameCancelled; } - private: LIBCAMERA_DISABLE_COPY_AND_MOVE(FrameBuffer) diff --git a/include/libcamera/internal/framebuffer.h b/include/libcamera/internal/framebuffer.h index 97dca963..8a9cc98e 100644 --- a/include/libcamera/internal/framebuffer.h +++ b/include/libcamera/internal/framebuffer.h @@ -31,6 +31,8 @@ public: Fence *fence() const { return fence_.get(); } void setFence(std::unique_ptr fence) { fence_ = std::move(fence); } + void cancel() { LIBCAMERA_O_PTR()->metadata_.status = FrameMetadata::FrameCancelled; } + private: std::unique_ptr fence_; Request *request_; -- cgit v1.2.1