From 69122be6235f1a757cd16b8ecde367981db4afbd Mon Sep 17 00:00:00 2001
From: Anjo Krank <akrank@apple.com>
Date: Wed, 5 Jul 2023 17:53:57 +0200
Subject: [PATCH] core: adding method to access CameraManager

Added the ability to get at the CameraManager to allow for access to the Camera list.
Also addded instance method to get the Camera list.

Signed-off-by: Anjo Krank <github@krank.net>
---
 core/libcamera_app.cpp | 7 ++++++-
 core/libcamera_app.hpp | 8 +++++++-
 core/options.cpp       | 2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/core/libcamera_app.cpp b/core/libcamera_app.cpp
index 233c9647..776b1431 100644
--- a/core/libcamera_app.cpp
+++ b/core/libcamera_app.cpp
@@ -136,7 +136,7 @@ void LibcameraApp::OpenCamera()
 	if (ret)
 		throw std::runtime_error("camera manager failed to start, code " + std::to_string(-ret));
 
-	std::vector<std::shared_ptr<libcamera::Camera>> cameras = LibcameraApp::GetCameras(camera_manager_);
+	std::vector<std::shared_ptr<libcamera::Camera>> cameras = GetCameras();
 	if (cameras.size() == 0)
 		throw std::runtime_error("no cameras available");
 	if (options_->camera >= cameras.size())
@@ -773,6 +773,11 @@ libcamera::Stream *LibcameraApp::GetMainStream() const
 	return nullptr;
 }
 
+const libcamera::CameraManager *LibcameraApp::GetCameraManager() const
+{
+	return camera_manager_.get();
+}
+
 std::vector<libcamera::Span<uint8_t>> LibcameraApp::Mmap(FrameBuffer *buffer) const
 {
 	auto item = mapped_buffers_.find(buffer);
diff --git a/core/libcamera_app.hpp b/core/libcamera_app.hpp
index 94da5e90..20eb7f5c 100644
--- a/core/libcamera_app.hpp
+++ b/core/libcamera_app.hpp
@@ -119,6 +119,12 @@ class LibcameraApp
 	Stream *LoresStream(StreamInfo *info = nullptr) const;
 	Stream *GetMainStream() const;
 
+	const CameraManager *GetCameraManager() const;
+	std::vector<std::shared_ptr<libcamera::Camera>> GetCameras()
+	{
+		return GetCameras(camera_manager_.get());
+	}
+
 	std::vector<libcamera::Span<uint8_t>> Mmap(FrameBuffer *buffer) const;
 
 	void ShowPreview(CompletedRequestPtr &completed_request, Stream *stream);
@@ -129,7 +135,7 @@ class LibcameraApp
 	static unsigned int verbosity;
 	static unsigned int GetVerbosity() { return verbosity; }
 
-	static std::vector<std::shared_ptr<libcamera::Camera>> GetCameras(const std::unique_ptr<CameraManager> &cm)
+	static std::vector<std::shared_ptr<libcamera::Camera>> GetCameras(const CameraManager *cm)
 	{
 		std::vector<std::shared_ptr<libcamera::Camera>> cameras = cm->cameras();
 		// Do not show USB webcams as these are not supported in libcamera-apps!
diff --git a/core/options.cpp b/core/options.cpp
index e42678ae..13d12b11 100644
--- a/core/options.cpp
+++ b/core/options.cpp
@@ -154,7 +154,7 @@ bool Options::Parse(int argc, char *argv[])
 		if (ret)
 			throw std::runtime_error("camera manager failed to start, code " + std::to_string(-ret));
 
-		std::vector<std::shared_ptr<libcamera::Camera>> cameras = LibcameraApp::GetCameras(cm);
+		std::vector<std::shared_ptr<libcamera::Camera>> cameras = LibcameraApp::GetCameras(cm.get());
 		if (cameras.size() != 0)
 		{
 			unsigned int idx = 0;