From 89d5d51bb304c3c4a363c306e0923087abc817fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= <pobrn@protonmail.com>
Date: Wed, 20 Jul 2022 03:11:58 +0200
Subject: [PATCH] spa: libcamera: fix build error due to return type change

libcamera commit 1c4d4801850559d6f919eef5c2ffbaf7675dbc46
changed the return type of libcamera::ControlList::get()
to be std::optional<T>. Adapt the code to this change.

Fixes #2575
---
 spa/plugins/libcamera/libcamera-device.cpp | 29 ++++++++++------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/spa/plugins/libcamera/libcamera-device.cpp b/spa/plugins/libcamera/libcamera-device.cpp
index 7f006a0cc..dd7ebd041 100644
--- a/spa/plugins/libcamera/libcamera-device.cpp
+++ b/spa/plugins/libcamera/libcamera-device.cpp
@@ -81,32 +81,29 @@ struct impl {
 std::string cameraModel(const Camera *camera)
 {
 	const ControlList &props = camera->properties();
-	std::string name;
-	if (props.contains(properties::Model))
-		name = props.get(properties::Model);
-	else
-		name = camera->id();
-        return name;
+
+	if (auto model = props.get(properties::Model))
+		return std::move(model.value());
+
+	return camera->id();
 }
 
 std::string cameraLoc(const Camera *camera)
 {
 	const ControlList &props = camera->properties();
-	std::string location;
-	if (props.contains(properties::Location)) {
-		switch (props.get(properties::Location)) {
+
+	if (auto location = props.get(properties::Location)) {
+		switch (location.value()) {
 		case properties::CameraLocationFront:
-			location = "front";
-			break;
+			return "front";
 		case properties::CameraLocationBack:
-			location = "back";
-			break;
+			return "back";
 		case properties::CameraLocationExternal:
-			location = "external";
-			break;
+			return "external";
 		}
 	}
-	return location;
+
+	return {};
 }
 
 static int emit_info(struct impl *impl, bool full)