[libcamera-devel,v5,2/6] libcamera: camera_manager: Refactor pipelines creation into separate function
diff mbox series

Message ID 20200616194523.23268-3-email@uajain.com
State Accepted
Commit c6f8ec7d8afdf6352fdbf6363052d7fa8370d1da
Headers show
Series
  • Introduce UVC hotplugging support
Related show

Commit Message

Umang Jain June 16, 2020, 7:45 p.m. UTC 
This commit introduces no functional changes.
Split pipelines creation code into a separate function,
so that the function can be re-used for upcoming hotplug
functionality in subsequent commits.

Also, fixup correct tag for \todo.

Signed-off-by: Umang Jain <email@uajain.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/camera_manager.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

Patch
diff mbox series 

diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index dbdc78e..de6d5d8 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -55,6 +55,7 @@  protected:
 
 private:
 	int init();
+	void createPipelineHandlers();
 	void cleanup();
 
 	CameraManager *cm_;
@@ -123,12 +124,20 @@  int CameraManager::Private::init()
 	if (!enumerator_ || enumerator_->enumerate())
 		return -ENODEV;
 
+	createPipelineHandlers();
+
+	return 0;
+}
+
+void CameraManager::Private::createPipelineHandlers()
+{
 	/*
-	 * TODO: Try to read handlers and order from configuration
+	 * \todo Try to read handlers and order from configuration
 	 * file and only fallback on all handlers if there is no
 	 * configuration file.
 	 */
-	std::vector<PipelineHandlerFactory *> &factories = PipelineHandlerFactory::factories();
+	std::vector<PipelineHandlerFactory *> &factories =
+		PipelineHandlerFactory::factories();
 
 	for (PipelineHandlerFactory *factory : factories) {
 		/*
@@ -146,14 +155,12 @@  int CameraManager::Private::init()
 		}
 	}
 
-	/* TODO: register hot-plug callback here */
-
-	return 0;
+	/* \todo Register hot-plug callback here */
 }
 
 void CameraManager::Private::cleanup()
 {
-	/* TODO: unregister hot-plug callback here */
+	/* \todo Unregister hot-plug callback here */
 
 	/*
 	 * Release all references to cameras to ensure they all get destroyed