1 files changed, 50 insertions, 12 deletions

diff --git a/src/cam/main.cpp b/src/cam/main.cpp
index 244720b4..70e9f62c 100644
--- a/src/cam/main.cpp
+++ b/src/cam/main.cpp
@@ -45,12 +45,14 @@ private:
 	int infoConfiguration();
 	int run();
 
+	std::string const cameraName(const Camera *camera);
+
 	static CamApp *app_;
 	OptionsParser::Options options_;
 	CameraManager *cm_;
 	std::shared_ptr<Camera> camera_;
 	std::unique_ptr<libcamera::CameraConfiguration> config_;
-	EventLoop *loop_;
+	EventLoop loop_;
 
 	bool strictFormats_;
 };
@@ -58,7 +60,7 @@ private:
 CamApp *CamApp::app_ = nullptr;
 
 CamApp::CamApp()
-	: cm_(nullptr), camera_(nullptr), config_(nullptr), loop_(nullptr),
+	: cm_(nullptr), camera_(nullptr), config_(nullptr),
 	  strictFormats_(false)
 {
 	CamApp::app_ = this;
@@ -132,16 +134,11 @@ int CamApp::init(int argc, char **argv)
 		std::cout << "Monitoring new hotplug and unplug events" << std::endl;
 	}
 
-	loop_ = new EventLoop(cm_->eventDispatcher());
-
 	return 0;
 }
 
 void CamApp::cleanup()
 {
-	delete loop_;
-	loop_ = nullptr;
-
 	if (camera_) {
 		camera_->release();
 		camera_.reset();
@@ -164,8 +161,7 @@ int CamApp::exec()
 
 void CamApp::quit()
 {
-	if (loop_)
-		loop_->exit();
+	loop_.exit();
 }
 
 int CamApp::parseOptions(int argc, char *argv[])
@@ -201,6 +197,9 @@ int CamApp::parseOptions(int argc, char *argv[])
 	parser.addOption(OptStrictFormats, OptionNone,
 			 "Do not allow requested stream format(s) to be adjusted",
 			 "strict-formats");
+	parser.addOption(OptMetadata, OptionNone,
+			 "Print the metadata for completed requests",
+			 "metadata");
 
 	options_ = parser.parse(argc, argv);
 	if (!options_.valid())
@@ -340,7 +339,7 @@ int CamApp::run()
 
 		unsigned int index = 1;
 		for (const std::shared_ptr<Camera> &cam : cm_->cameras()) {
-			std::cout << index << ": " << cam->id() << std::endl;
+			std::cout << index << ": " << cameraName(cam.get()) << std::endl;
 			index++;
 		}
 	}
@@ -364,13 +363,13 @@ int CamApp::run()
 	}
 
 	if (options_.isSet(OptCapture)) {
-		Capture capture(camera_, config_.get(), loop_);
+		Capture capture(camera_, config_.get(), &loop_);
 		return capture.run(options_);
 	}
 
 	if (options_.isSet(OptMonitor)) {
 		std::cout << "Press Ctrl-C to interrupt" << std::endl;
-		ret = loop_->exec();
+		ret = loop_.exec();
 		if (ret)
 			std::cout << "Failed to run monitor loop" << std::endl;
 	}
@@ -378,6 +377,45 @@ int CamApp::run()
 	return 0;
 }
 
+std::string const CamApp::cameraName(const Camera *camera)
+{
+	const ControlList &props = camera->properties();
+	bool addModel = true;
+	std::string name;
+
+	/*
+	 * Construct the name from the camera location, model and ID. The model
+	 * is only used if the location isn't present or is set to External.
+	 */
+	if (props.contains(properties::Location)) {
+		switch (props.get(properties::Location)) {
+		case properties::CameraLocationFront:
+			addModel = false;
+			name = "Internal front camera ";
+			break;
+		case properties::CameraLocationBack:
+			addModel = false;
+			name = "Internal back camera ";
+			break;
+		case properties::CameraLocationExternal:
+			name = "External camera ";
+			break;
+		}
+	}
+
+	if (addModel && props.contains(properties::Model)) {
+		/*
+		 * If the camera location is not availble use the camera model
+		 * to build the camera name.
+		 */
+		name = "'" + props.get(properties::Model) + "' ";
+	}
+
+	name += "(" + camera->id() + ")";
+
+	return name;
+}
+
 void signalHandler([[maybe_unused]] int signal)
 {
 	std::cout << "Exiting" << std::endl;