From 275fd5bd33107a10b1e47a0d36d834b390831af0 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Mon, 23 Mar 2020 01:25:20 +0200
Subject: qcam: viewfinder: Add MappedBuffer to store memory mapping
 information

The new MappedBuffer structure replaces the std::pair<> used in the
mapped buffers map, and allows passing data to the ViewFinder::display()
function in a more structured way.

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

(limited to 'src/qcam/main_window.h')

diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h
index c662a2ef..71206bc9 100644
--- a/src/qcam/main_window.h
+++ b/src/qcam/main_window.h
@@ -24,11 +24,11 @@
 #include <libcamera/stream.h>
 
 #include "../cam/options.h"
+#include "viewfinder.h"
 
 using namespace libcamera;
 
 class QAction;
-class ViewFinder;
 
 enum {
 	OptCamera = 'c',
@@ -89,7 +89,7 @@ private:
 	FrameBufferAllocator *allocator_;
 
 	std::unique_ptr<CameraConfiguration> config_;
-	std::map<int, std::pair<void *, unsigned int>> mappedBuffers_;
+	std::map<FrameBuffer *, MappedBuffer> mappedBuffers_;
 
 	/* Capture state, buffers queue and statistics */
 	bool isCapturing_;
-- 
cgit v1.2.1