From 800a861b0150825fa2ff12c78340c8b03719641c Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 14 Oct 2025 23:33:02 +0300 Subject: [PATCH] libcamera: global_configuration: Rename yamlConfiguration_ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Once parsed, the global configuration isn't a YAML file anymore. Rename the yamlConfiguration_ to configuration_. Signed-off-by: Laurent Pinchart Reviewed-by: Barnabás Pőcze Reviewed-by: Isaac Scott --- include/libcamera/internal/global_configuration.h | 2 +- src/libcamera/global_configuration.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h index 80b57b38..5c907ee9 100644 --- a/include/libcamera/internal/global_configuration.h +++ b/include/libcamera/internal/global_configuration.h @@ -56,7 +56,7 @@ private: void load(); bool loadFile(const std::filesystem::path &fileName); - std::unique_ptr yamlConfiguration_ = + std::unique_ptr configuration_ = std::make_unique(); }; diff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp index 44ed206d..ee7d9c18 100644 --- a/src/libcamera/global_configuration.cpp +++ b/src/libcamera/global_configuration.cpp @@ -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().value_or(0); + return (*configuration_)["version"].get().value_or(0); } /** @@ -160,7 +160,7 @@ unsigned int GlobalConfiguration::version() const */ GlobalConfiguration::Configuration GlobalConfiguration::configuration() const { - return (*yamlConfiguration_)["configuration"]; + return (*configuration_)["configuration"]; } /**