From e191001939c1a6c3dc22ad195d61f062a0ddc5f5 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Mon, 24 Apr 2023 00:15:49 +0530 Subject: apps: cam: kms_sink: Drop unique_ptr<> from DRM::AtomicRequest There is no need to wrap DRM::AtomicRequest in std::unique_ptr<> in KMSSink::start(). Remove it so that the syntax becomes similar to what we have in KMSSink::stop(). No functional changes intended. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart --- src/apps/cam/kms_sink.cpp | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'src/apps/cam') diff --git a/src/apps/cam/kms_sink.cpp b/src/apps/cam/kms_sink.cpp index 353209cd..6991c3fa 100644 --- a/src/apps/cam/kms_sink.cpp +++ b/src/apps/cam/kms_sink.cpp @@ -303,24 +303,22 @@ int KMSSink::configurePipeline(const libcamera::PixelFormat &format) int KMSSink::start() { - std::unique_ptr request; - int ret = FrameSink::start(); if (ret < 0) return ret; /* Disable all CRTCs and planes to start from a known valid state. */ - request = std::make_unique(&dev_); + DRM::AtomicRequest request(&dev_); for (const DRM::Crtc &crtc : dev_.crtcs()) - request->addProperty(&crtc, "ACTIVE", 0); + request.addProperty(&crtc, "ACTIVE", 0); for (const DRM::Plane &plane : dev_.planes()) { - request->addProperty(&plane, "CRTC_ID", 0); - request->addProperty(&plane, "FB_ID", 0); + request.addProperty(&plane, "CRTC_ID", 0); + request.addProperty(&plane, "FB_ID", 0); } - ret = request->commit(DRM::AtomicRequest::FlagAllowModeset); + ret = request.commit(DRM::AtomicRequest::FlagAllowModeset); if (ret < 0) { std::cerr << "Failed to disable CRTCs and planes: " -- cgit v1.2.1