From b0c730e330281f38ac51cb64d9581ed278759048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= <niklas.soderlund@ragnatech.se>
Date: Fri, 5 Apr 2019 02:52:59 +0200
Subject: libcamera: Switch to CameraConfiguration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Implement the camera configuration thru out the library, tests, cam and
qcam tools.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 test/camera/capture.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'test/camera/capture.cpp')

diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index b8dbdb62..4e75a75c 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -42,12 +42,12 @@ protected:
 
 	int run()
 	{
-		std::map<Stream *, StreamConfiguration> conf =
+		CameraConfiguration conf =
 			camera_->streamConfiguration({ Stream::VideoRecording() });
-		Stream *stream = conf.begin()->first;
-		StreamConfiguration *sconf = &conf.begin()->second;
+		Stream *stream = conf.front();
+		StreamConfiguration *sconf = &conf[stream];
 
-		if (!configurationValid(conf)) {
+		if (!conf.isValid()) {
 			cout << "Failed to read default configuration" << endl;
 			return TestFail;
 		}
-- 
cgit v1.2.1