From 4cd0f586fbc7bc8451bd18aaa3b59fbd8d53574e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 5 Jul 2021 07:15:53 +0300 Subject: cam: Move event loop execution from CameraSession to CamApp To prepare for multiple concurrent camera sessions, move the event loop exec() call from the CameraSession class to the CamApp class. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/main.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src/cam/main.cpp') diff --git a/src/cam/main.cpp b/src/cam/main.cpp index a567a7cc..b13230c3 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -371,7 +371,17 @@ int CamApp::run() if (options_.isSet(OptCapture)) { CameraSession session(camera_, config_.get()); session.captureDone.connect(this, &CamApp::captureDone); - return session.run(options_); + + ret = session.start(options_); + if (ret) { + std::cout << "Failed to start camera session" << std::endl; + return ret; + } + + loop_.exec(); + + session.stop(); + return 0; } if (options_.isSet(OptMonitor)) { -- cgit v1.2.1