NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: pipeline_handler: Rename handlers() method to factories()

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2019-01-14 18:02:59 +02:00
parent 619d312462
commit 6ee4050182
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcamera/camera_manager.cpp
View file

@ -86,9 +86,9 @@ int CameraManager::start()
* file and only fallback on all handlers if there is no * file and only fallback on all handlers if there is no
* configuration file. * 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 * Try each pipeline handler until it exhaust
* all pipelines it can provide. * all pipelines it can provide.

2
src/libcamera/include/pipeline_handler.h
View file

@ -39,7 +39,7 @@ public:
const std::string &name() const { return name_; } const std::string &name() const { return name_; }
static void registerType(PipelineHandlerFactory *factory); static void registerType(PipelineHandlerFactory *factory);
static std::vector<PipelineHandlerFactory *> &handlers(); static std::vector<PipelineHandlerFactory *> &factories();
private: private:
std::string name_; std::string name_;

6
src/libcamera/pipeline_handler.cpp
View file

@ -92,7 +92,7 @@ namespace libcamera {
* \param[in] name Name of the pipeline handler class * \param[in] name Name of the pipeline handler class
* *
* Creating an instance of the factory registers is with the global list of * 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. * 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) void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)
{ {
std::vector<PipelineHandlerFactory *> &factories = handlers(); std::vector<PipelineHandlerFactory *> &factories = PipelineHandlerFactory::factories();
factories.push_back(factory); factories.push_back(factory);
@ -142,7 +142,7 @@ void PipelineHandlerFactory::registerType(PipelineHandlerFactory *factory)
* *
* \return the list of pipeline handler factories * \return the list of pipeline handler factories
*/ */
std::vector<PipelineHandlerFactory *> &PipelineHandlerFactory::handlers() std::vector<PipelineHandlerFactory *> &PipelineHandlerFactory::factories()
{ {
static std::vector<PipelineHandlerFactory *> factories; static std::vector<PipelineHandlerFactory *> factories;
return factories; return factories;