{"id":26475,"url":"https://patchwork.libcamera.org/api/1.1/patches/26475/?format=json","web_url":"https://patchwork.libcamera.org/patch/26475/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260407153427.1825999-36-laurent.pinchart@ideasonboard.com>","date":"2026-04-07T15:34:20","name":"[v2,35/42] libcamera: global_configuration: Rename Configuration to Option","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"31b1bed2c38469ac0e4fe1603317d4d427c5d50c","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/26475/mbox/","series":[{"id":5873,"url":"https://patchwork.libcamera.org/api/1.1/series/5873/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5873","date":"2026-04-07T15:33:45","name":"libcamera: Global configuration file improvements","version":2,"mbox":"https://patchwork.libcamera.org/series/5873/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26475/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26475/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id BBA50C3332\n\tfor ;\n\tTue, 7 Apr 2026 15:35:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 381E262E4D;\n\tTue, 7 Apr 2026 17:35:22 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E513C62E47\n\tfor ;\n\tTue, 7 Apr 2026 17:35:16 +0200 (CEST)","from killaraus.ideasonboard.com\n\t(2001-14ba-703d-e500--2a1.rev.dnainternet.fi\n\t[IPv6:2001:14ba:703d:e500::2a1])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 52FD7596\n\tfor ;\n\tTue, 7 Apr 2026 17:33:49 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"FX9l3Knw\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1775576029;\n\tbh=3SSGp8PFIxLFOhWlmAlNBj1WQXbI9717NlG/x15IoSU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=FX9l3KnwC+39yY4cRs0HbEZU8VvIEpyDdNXc8UN6J/6QKkX/GTGrKLv3bj8nCPjxu\n\tTOyiIvUp8NI3XhNX/i1HvbMn+jrNaRUtvH5h5XsMlpVaNKzM57EdTTwagc2IB3I0Xl\n\tNmxZkRCHkZxOpqTwqc9LlGSJy2ATpnZXJtHPcmnc=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 35/42] libcamera: global_configuration: Rename\n\tConfiguration to Option","Date":"Tue, 7 Apr 2026 18:34:20 +0300","Message-ID":"<20260407153427.1825999-36-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.52.0","In-Reply-To":"<20260407153427.1825999-1-laurent.pinchart@ideasonboard.com>","References":"<20260407153427.1825999-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The GlobalConfiguration::Configuration type represent a configuration\noption. Rename it to Option to make this clearer. This shortens lines as\nan added bonus.\n\nSigned-off-by: Laurent Pinchart \nReviewed-by: Barnabás Pőcze \n---\n include/libcamera/internal/global_configuration.h | 4 ++--\n src/libcamera/global_configuration.cpp | 8 ++++----\n src/libcamera/pipeline/simple/simple.cpp | 2 +-\n 3 files changed, 7 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex 5c907ee92bfe..2c0bfadb4676 100644\n--- a/include/libcamera/internal/global_configuration.h\n+++ b/include/libcamera/internal/global_configuration.h\n@@ -22,12 +22,12 @@ namespace libcamera {\n class GlobalConfiguration\n {\n public:\n-\tusing Configuration = const ValueNode &;\n+\tusing Option = const ValueNode &;\n \n \tGlobalConfiguration();\n \n \tunsigned int version() const;\n-\tConfiguration configuration() const;\n+\tOption configuration() const;\n \n \ttemplate\n \tstd::optional option(\ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex ee7d9c185b80..4d154c026e44 100644\n--- a/src/libcamera/global_configuration.cpp\n+++ b/src/libcamera/global_configuration.cpp\n@@ -56,8 +56,8 @@ LOG_DEFINE_CATEGORY(Configuration)\n */\n \n /**\n- * \\typedef GlobalConfiguration::Configuration\n- * \\brief Type representing global libcamera configuration\n+ * \\typedef GlobalConfiguration::Option\n+ * \\brief Type representing a configuration option\n *\n * All code outside GlobalConfiguration must use this type declaration and not\n * the underlying type.\n@@ -156,9 +156,9 @@ unsigned int GlobalConfiguration::version() const\n * \\note \\a ValueNode type itself shouldn't be used in type declarations to\n * avoid trouble if we decide to change the underlying data objects in future.\n *\n- * \\return The whole configuration section\n+ * \\return The top-level configuration option\n */\n-GlobalConfiguration::Configuration GlobalConfiguration::configuration() const\n+GlobalConfiguration::Option GlobalConfiguration::configuration() const\n {\n \treturn (*configuration_)[\"configuration\"];\n }\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 812ff79695d1..0aa5b1c5255a 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -1880,7 +1880,7 @@ bool SimplePipelineHandler::matchDevice(std::shared_ptr media,\n \n \tswIspEnabled_ = info.swIspEnabled;\n \tconst GlobalConfiguration &configuration = cameraManager()->_d()->configuration();\n-\tfor (GlobalConfiguration::Configuration entry :\n+\tfor (GlobalConfiguration::Option entry :\n \t configuration.configuration()[\"pipelines\"][\"simple\"][\"supported_devices\"]\n \t\t .asList()) {\n \t\tauto name = entry[\"driver\"].get();\n","prefixes":["v2","35/42"]}