PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: global_configuration: Rename yamlConfiguration_

Browse Source 
Once parsed, the global configuration isn't a YAML file anymore. Rename
the yamlConfiguration_ to configuration_.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2025-10-14 23:33:02 +03:00
parent 49d87c613b
commit 800a861b01
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/libcamera/internal/global_configuration.h
View File

@@ -56,7 +56,7 @@ private:
void load();
bool loadFile(const std::filesystem::path &fileName);
std::unique_ptr<ValueNode> yamlConfiguration_ =
std::unique_ptr<ValueNode> configuration_ =
std::make_unique<ValueNode>();
};

6
src/libcamera/global_configuration.cpp
View File

@@ -125,7 +125,7 @@ bool GlobalConfiguration::loadFile(const std::filesystem::path &fileName)
return true;
}
yamlConfiguration_ = std::move(configuration);
configuration_ = std::move(configuration);
return true;
}
@@ -141,7 +141,7 @@ bool GlobalConfiguration::loadFile(const std::filesystem::path &fileName)
*/
unsigned int GlobalConfiguration::version() const
{
return (*yamlConfiguration_)["version"].get<unsigned int>().value_or(0);
return (*configuration_)["version"].get<unsigned int>().value_or(0);
}
/**
@@ -160,7 +160,7 @@ unsigned int GlobalConfiguration::version() const
*/
GlobalConfiguration::Configuration GlobalConfiguration::configuration() const
{
return (*yamlConfiguration_)["configuration"];
return (*configuration_)["configuration"];
}
/**