{"id":26476,"url":"https://patchwork.libcamera.org/api/1.1/patches/26476/?format=json","web_url":"https://patchwork.libcamera.org/patch/26476/","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-37-laurent.pinchart@ideasonboard.com>","date":"2026-04-07T15:34:21","name":"[v2,36/42] libcamera: global_configuration: Drop Option type","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"16afd3da6e72a5b6e346a01dc73696f4bd1d06b4","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/26476/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/26476/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26476/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 BCEA9C32F8\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue,  7 Apr 2026 15:35:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3B3FF62E59;\n\tTue,  7 Apr 2026 17:35:25 +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 48A2A62E4B\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  7 Apr 2026 17:35:18 +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 9E4F6596\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  7 Apr 2026 17:33:50 +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=\"gySEpswz\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1775576030;\n\tbh=e/qv440tTvCbF/J/ZNHuJhJUaMF+UoqbLP8keLi6D9I=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=gySEpswzUJz9z+8EYBxTfyCFM1U/FzYsA7l3ROtu7IDSP8raVsq0PeC5jgEHsAmLG\n\tB9BahZgYA8diZrQnzK/YvvUbkTe3aJFZ91UXyk5HgkctxSsk1G2RGSlQYrrbkHmWL/\n\t02uPSSo4B4byER8VglNwhTq2gMsNywb6/H/Jp+J8=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v2 36/42] libcamera: global_configuration: Drop Option type","Date":"Tue,  7 Apr 2026 18:34:21 +0300","Message-ID":"<20260407153427.1825999-37-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-Transfer-Encoding":"8bit","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"The GlobalConfiguration::Option type was introduced to decouple the\nconfiguration option storage from its users, and make changes to the\nunderlying implementation easier. While the type could indeed be changed\nto map to a different class, the API would need to remain the same. The\nOption type therefore brings little value. Drop it.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/internal/global_configuration.h |  4 +---\n src/libcamera/global_configuration.cpp            | 10 +---------\n src/libcamera/pipeline/simple/simple.cpp          |  2 +-\n 3 files changed, 3 insertions(+), 13 deletions(-)","diff":"diff --git a/include/libcamera/internal/global_configuration.h b/include/libcamera/internal/global_configuration.h\nindex 2c0bfadb4676..5eb646e33fc2 100644\n--- a/include/libcamera/internal/global_configuration.h\n+++ b/include/libcamera/internal/global_configuration.h\n@@ -22,12 +22,10 @@ namespace libcamera {\n class GlobalConfiguration\n {\n public:\n-\tusing Option = const ValueNode &;\n-\n \tGlobalConfiguration();\n \n \tunsigned int version() const;\n-\tOption configuration() const;\n+\tconst ValueNode &configuration() const;\n \n \ttemplate<typename T>\n \tstd::optional<T> option(\ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex 4d154c026e44..cd9cc25e43fd 100644\n--- a/src/libcamera/global_configuration.cpp\n+++ b/src/libcamera/global_configuration.cpp\n@@ -55,14 +55,6 @@ LOG_DEFINE_CATEGORY(Configuration)\n  * options, or configuration() to access the whole configuration.\n  */\n \n-/**\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- */\n-\n /**\n  * \\brief Initialize the global configuration\n  */\n@@ -158,7 +150,7 @@ unsigned int GlobalConfiguration::version() const\n  *\n  * \\return The top-level configuration option\n  */\n-GlobalConfiguration::Option GlobalConfiguration::configuration() const\n+const ValueNode &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 0aa5b1c5255a..c6fe12d65b18 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<MediaDevice> media,\n \n \tswIspEnabled_ = info.swIspEnabled;\n \tconst GlobalConfiguration &configuration = cameraManager()->_d()->configuration();\n-\tfor (GlobalConfiguration::Option entry :\n+\tfor (const ValueNode &entry :\n \t     configuration.configuration()[\"pipelines\"][\"simple\"][\"supported_devices\"]\n \t\t     .asList()) {\n \t\tauto name = entry[\"driver\"].get<std::string>();\n","prefixes":["v2","36/42"]}