1 files changed, 9 insertions, 7 deletions
diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h
index 1fc5ebef..a095f4e2 100644
--- a/src/v4l2/v4l2_camera.h
+++ b/src/v4l2/v4l2_camera.h
@@ -12,13 +12,13 @@
 #include <mutex>
 #include <utility>
 
-#include <libcamera/buffer.h>
+#include <libcamera/base/semaphore.h>
+
 #include <libcamera/camera.h>
 #include <libcamera/file_descriptor.h>
+#include <libcamera/framebuffer.h>
 #include <libcamera/framebuffer_allocator.h>
 
-#include "libcamera/internal/semaphore.h"
-
 using namespace libcamera;
 
 class V4L2Camera
@@ -26,12 +26,12 @@ class V4L2Camera
 public:
 	struct Buffer {
 		Buffer(unsigned int index, const FrameMetadata &data)
-			: index(index), data(data)
+			: index_(index), data_(data)
 		{
 		}
 
-		unsigned int index;
-		FrameMetadata data;
+		unsigned int index_;
+		FrameMetadata data_;
 	};
 
 	V4L2Camera(std::shared_ptr<Camera> camera);
@@ -76,7 +76,9 @@ private:
 	std::mutex bufferLock_;
 	FrameBufferAllocator *bufferAllocator_;
 
-	std::deque<std::unique_ptr<Request>> pendingRequests_;
+	std::vector<std::unique_ptr<Request>> requestPool_;
+
+	std::deque<Request *> pendingRequests_;
 	std::deque<std::unique_ptr<Buffer>> completedBuffers_;
 
 	int efd_;