{"id":236,"url":"https://patchwork.libcamera.org/api/1.1/patches/236/?format=json","web_url":"https://patchwork.libcamera.org/patch/236/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190115151849.1547-5-laurent.pinchart@ideasonboard.com>","date":"2019-01-15T15:18:45","name":"[libcamera-devel,v2,4/8] libcamera: pipeline_handler: Rename handlers() method to factories()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"75ab218e23e47e71885df33d25ce8ba53df8a579","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/236/mbox/","series":[{"id":81,"url":"https://patchwork.libcamera.org/api/1.1/series/81/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=81","date":"2019-01-15T15:18:41","name":"Pipeline handler refactoring and assorted improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/81/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/236/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/236/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 49D3A60C87\n\tfor ;\n\tTue, 15 Jan 2019 16:18:54 +0100 (CET)","from pendragon.bb.dnainternet.fi\n\t(dfj612yhrgyx302h3jwwy-3.rev.dnainternet.fi\n\t[IPv6:2001:14ba:21f5:5b00:ce28:277f:58d7:3ca4])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id D06C24F8\n\tfor ;\n\tTue, 15 Jan 2019 16:18:53 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1547565534;\n\tbh=rPg7O5lAfsSHYGN90ySpf8AE5T1imF3N1ZckaPWjuqg=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=ALSDMgx+WDKKdIgGFAM3cjPV/UYYJSOY9wCSqqSoWuxiNSIs6ZE9qy0pAei4Zj3c4\n\t78qJyjMKgBJ/7J1Rc7btvnCemUtd8jcsesHBZ7jv+uPHP3otkcQ6m3/D1jghAsdFJM\n\thYwctNaCKsUeux2Gy3pJi/FdtCMB3di6xdOaewu4=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 15 Jan 2019 17:18:45 +0200","Message-Id":"<20190115151849.1547-5-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190115151849.1547-1-laurent.pinchart@ideasonboard.com>","References":"<20190115151849.1547-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 4/8] libcamera: pipeline_handler:\n\tRename handlers() method to factories()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Tue, 15 Jan 2019 15:18:55 -0000"},"content":"The PipelineHandlerFactory::handlers() static method returns a list of\nfactories, not a list of handlers. Rename it accordingly.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/camera_manager.cpp | 4 ++--\n src/libcamera/include/pipeline_handler.h | 2 +-\n src/libcamera/pipeline_handler.cpp | 6 +++---\n 3 files changed, 6 insertions(+), 6 deletions(-)","diff":"diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp\nindex 4313994e97c8..a17bf3d13a04 100644\n--- a/src/libcamera/camera_manager.cpp\n+++ b/src/libcamera/camera_manager.cpp\n@@ -86,9 +86,9 @@ int CameraManager::start()\n \t * file and only fallback on all handlers if there is no\n \t * configuration file.\n \t */\n-\tstd::vector &handlers = PipelineHandlerFactory::handlers();\n+\tstd::vector &factories = PipelineHandlerFactory::factories();\n \n-\tfor (PipelineHandlerFactory *factory : handlers) {\n+\tfor (PipelineHandlerFactory *factory : factories) {\n \t\t/*\n \t\t * Try each pipeline handler until it exhaust\n \t\t * all pipelines it can provide.\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 764dde9ccc65..e976aaa13546 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -39,7 +39,7 @@ public:\n \tconst std::string &name() const { return name_; }\n \n \tstatic void registerType(PipelineHandlerFactory *factory);\n-\tstatic std::vector &handlers();\n+\tstatic std::vector &factories();\n \n private:\n \tstd::string name_;\ndiff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp\nindex 08e3291e741a..4dfbc814a813 100644\n--- a/src/libcamera/pipeline_handler.cpp\n+++ b/src/libcamera/pipeline_handler.cpp\n@@ -92,7 +92,7 @@ namespace libcamera {\n * \\param[in] name Name of the pipeline handler class\n *\n * Creating an instance of the factory registers is with the global list of\n- * factories, accessible through the handlers() function.\n+ * factories, accessible through the factories() function.\n *\n * The factory \\a name is used for debug purpose and shall be unique.\n */\n@@ -127,7 +127,7 @@ PipelineHandlerFactory::PipelineHandlerFactory(const char *name)\n */\n void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)\n {\n-\tstd::vector &factories = handlers();\n+\tstd::vector &factories = PipelineHandlerFactory::factories();\n \n \tfor (PipelineHandlerFactory *f : factories)\n \t\tASSERT(factory->name() != f->name());\n@@ -145,7 +145,7 @@ void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)\n *\n * \\return the list of pipeline handler factories\n */\n-std::vector &PipelineHandlerFactory::handlers()\n+std::vector &PipelineHandlerFactory::factories()\n {\n \tstatic std::vector factories;\n \treturn factories;\n","prefixes":["libcamera-devel","v2","4/8"]}