{"id":25744,"url":"https://patchwork.libcamera.org/api/patches/25744/?format=json","web_url":"https://patchwork.libcamera.org/patch/25744/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20260113000808.15395-25-laurent.pinchart@ideasonboard.com>","date":"2026-01-13T00:07:56","name":"[24/36] 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/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/25744/mbox/","series":[{"id":5703,"url":"https://patchwork.libcamera.org/api/series/5703/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5703","date":"2026-01-13T00:07:32","name":"libcamera: Global configuration file improvements","version":1,"mbox":"https://patchwork.libcamera.org/series/5703/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/25744/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/25744/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 2692EC32E7\n\tfor ;\n\tTue, 13 Jan 2026 00:09:11 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C038E61FFE;\n\tTue, 13 Jan 2026 01:09:10 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7991061FF4\n\tfor ;\n\tTue, 13 Jan 2026 01:09:09 +0100 (CET)","from pendragon.ideasonboard.com (81-175-209-152.bb.dnainternet.fi\n\t[81.175.209.152])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id B8B2ABCA\n\tfor ;\n\tTue, 13 Jan 2026 01:08:43 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"f5gtUNvK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1768262923;\n\tbh=X9kirumTMtE66ZYFuT/Z9ToZS2MjYkwFNNYolZ9KKuI=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=f5gtUNvKhk6VxLP5/Pises8u1ktSENVQcT2frfq+NKl9BJQn5JEmc5LbY+3JhNUIq\n\tSvH7EDxdtRc/bxfOzusqweD6/7TKQeFTNo74IHilZ5sG9qatnTi6cQp/7sdrRRMU4Z\n\td7QtDqJYc4++9Rld/H1/iJcbNHiwPqTDZPpJ7wuI=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH 24/36] libcamera: global_configuration: Rename Configuration\n\tto Option","Date":"Tue, 13 Jan 2026 02:07:56 +0200","Message-ID":"<20260113000808.15395-25-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.51.2","In-Reply-To":"<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>","References":"<20260113000808.15395-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","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 \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 b30b0a122e6e..bdc87d39ef0b 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":["24/36"]}