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

libcamera: global_configuration: Rename Configuration to Option

Browse Source 
The GlobalConfiguration::Configuration type represent a configuration
option. Rename it to Option to make this clearer. This shortens lines as
an added bonus.

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 800a861b01
commit 24c965a234
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,12 +22,12 @@ namespace libcamera {
class GlobalConfiguration
{
public:
using Configuration = const ValueNode &;
using Option = const ValueNode &;
GlobalConfiguration();
unsigned int version() const;
Configuration configuration() const;
Option configuration() const;
template<typename T>
std::optional<T> option(

8
src/libcamera/global_configuration.cpp
View File

@@ -56,8 +56,8 @@ LOG_DEFINE_CATEGORY(Configuration)
*/
/**
* \typedef GlobalConfiguration::Configuration
* \brief Type representing global libcamera configuration
* \typedef GlobalConfiguration::Option
* \brief Type representing a configuration option
*
* All code outside GlobalConfiguration must use this type declaration and not
* the underlying type.
@@ -156,9 +156,9 @@ unsigned int GlobalConfiguration::version() const
* \note \a ValueNode type itself shouldn't be used in type declarations to
* avoid trouble if we decide to change the underlying data objects in future.
*
* \return The whole configuration section
* \return The top-level configuration option
*/
GlobalConfiguration::Configuration GlobalConfiguration::configuration() const
GlobalConfiguration::Option GlobalConfiguration::configuration() const
{
return (*configuration_)["configuration"];
}

2
src/libcamera/pipeline/simple/simple.cpp
View File

@@ -1880,7 +1880,7 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr<MediaDevice> media,
swIspEnabled_ = info.swIspEnabled;
const GlobalConfiguration &configuration = cameraManager()->_d()->configuration();
for (GlobalConfiguration::Configuration entry :
for (GlobalConfiguration::Option entry :
configuration.configuration()["pipelines"]["simple"]["supported_devices"]
.asList()) {
auto name = entry["driver"].get<std::string>();