From d1f034055fbb433d155db147752e09580451df04 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 19 Jul 2022 15:24:56 +0300 Subject: simple-cam: Update to the new ControList::get() API The ControlList::get() function has changed and now returns a std::optional. Adapt simple-cam accordingly. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- simple-cam.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/simple-cam.cpp b/simple-cam.cpp index 4de1b7d..3e17839 100644 --- a/simple-cam.cpp +++ b/simple-cam.cpp @@ -133,18 +133,22 @@ std::string cameraName(Camera *camera) const ControlList &props = camera->properties(); std::string name; - switch (props.get(properties::Location)) { - case properties::CameraLocationFront: - name = "Internal front camera"; - break; - case properties::CameraLocationBack: - name = "Internal back camera"; - break; - case properties::CameraLocationExternal: - name = "External camera"; - if (props.contains(properties::Model)) - name += " '" + props.get(properties::Model) + "'"; - break; + const auto &location = props.get(properties::Location); + if (location) { + switch (*location) { + case properties::CameraLocationFront: + name = "Internal front camera"; + break; + case properties::CameraLocationBack: + name = "Internal back camera"; + break; + case properties::CameraLocationExternal: + name = "External camera"; + const auto &model = props.get(properties::Model); + if (model) + name = " '" + *model + "'"; + break; + } } name += " (" + camera->id() + ")"; -- cgit v1.2.1