summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-01-14 18:02:59 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-01-16 18:23:43 +0200
commit6ee4050182e6ac2196baf0147ee59f193ed37eb1 (patch)
tree7a436d9bbbb2df0d9d3059c790e3227f98acafb4 /src
parent619d3124627078bfd0134f9039b0c501e36e1d7e (diff)
libcamera: pipeline_handler: Rename handlers() method to factories()
The PipelineHandlerFactory::handlers() static method returns a list of factories, not a list of handlers. Rename it accordingly. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/camera_manager.cpp4
-rw-r--r--src/libcamera/include/pipeline_handler.h2
-rw-r--r--src/libcamera/pipeline_handler.cpp6
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp
index 2b8ef2ce..2ee83d4d 100644
--- a/src/libcamera/camera_manager.cpp
+++ b/src/libcamera/camera_manager.cpp
@@ -86,9 +86,9 @@ int CameraManager::start()
* file and only fallback on all handlers if there is no
* configuration file.
*/
- std::vector<PipelineHandlerFactory *> &handlers = PipelineHandlerFactory::handlers();
+ std::vector<PipelineHandlerFactory *> &factories = PipelineHandlerFactory::factories();
- for (PipelineHandlerFactory *factory : handlers) {
+ for (PipelineHandlerFactory *factory : factories) {
/*
* Try each pipeline handler until it exhaust
* all pipelines it can provide.
diff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h
index 764dde9c..e976aaa1 100644
--- a/src/libcamera/include/pipeline_handler.h
+++ b/src/libcamera/include/pipeline_handler.h
@@ -39,7 +39,7 @@ public:
const std::string &name() const { return name_; }
static void registerType(PipelineHandlerFactory *factory);
- static std::vector<PipelineHandlerFactory *> &handlers();
+ static std::vector<PipelineHandlerFactory *> &factories();
private:
std::string name_;
diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp
index d244acbd..c19ab94f 100644
--- a/src/libcamera/pipeline_handler.cpp
+++ b/src/libcamera/pipeline_handler.cpp
@@ -92,7 +92,7 @@ namespace libcamera {
* \param[in] name Name of the pipeline handler class
*
* Creating an instance of the factory registers is with the global list of
- * factories, accessible through the handlers() function.
+ * factories, accessible through the factories() function.
*
* The factory \a name is used for debug purpose and shall be unique.
*/
@@ -127,7 +127,7 @@ PipelineHandlerFactory::PipelineHandlerFactory(const char *name)
*/
void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)
{
- std::vector<PipelineHandlerFactory *> &factories = handlers();
+ std::vector<PipelineHandlerFactory *> &factories = PipelineHandlerFactory::factories();
factories.push_back(factory);
@@ -142,7 +142,7 @@ void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)
*
* \return the list of pipeline handler factories
*/
-std::vector<PipelineHandlerFactory *> &PipelineHandlerFactory::handlers()
+std::vector<PipelineHandlerFactory *> &PipelineHandlerFactory::factories()
{
static std::vector<PipelineHandlerFactory *> factories;
return factories;