{"id":26553,"url":"https://patchwork.libcamera.org/api/patches/26553/?format=json","web_url":"https://patchwork.libcamera.org/patch/26553/","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":"<20260423230059.3180987-32-laurent.pinchart@ideasonboard.com>","date":"2026-04-23T23:00:53","name":"[v3,31/37] libcamera: global_configuration: Drop Option type","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c116c10a31d4ab9ea61dc5787db7ff15f8162f74","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/26553/mbox/","series":[{"id":5883,"url":"https://patchwork.libcamera.org/api/series/5883/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5883","date":"2026-04-23T23:00:22","name":"libcamera: Global configuration file improvements","version":3,"mbox":"https://patchwork.libcamera.org/series/5883/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/26553/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/26553/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 57A78BDCB5\n\tfor ;\n\tThu, 23 Apr 2026 23:02:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E367B62FD2;\n\tFri, 24 Apr 2026 01:02:03 +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 EC7ED62FD4\n\tfor ;\n\tFri, 24 Apr 2026 01:01:43 +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 ESMTPSA id 77AC3103F\n\tfor ;\n\tFri, 24 Apr 2026 01:00:04 +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=\"HE2ctQaQ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1776985204;\n\tbh=F+MFMICu/EPDXmepeY81IjCYxIkD50idCDxacjaI5y8=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=HE2ctQaQDFEm7/JDVTtwH50PUKQbgnk7UjfHFmAxq597x0j4LGtnrGq6r+lW+NJi+\n\tCBFVRaa7G26xg9IZoU0NbvFVAdrG2r+W6rfa7NqUUwVNJWA2hG4VndwpNMVqf0MdRH\n\t7wXY3edSH+P6bcE+xx8fNSmjYqvq2Yr++H+rBZuM=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Subject":"[PATCH v3 31/37] libcamera: global_configuration: Drop Option type","Date":"Fri, 24 Apr 2026 02:00:53 +0300","Message-ID":"<20260423230059.3180987-32-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.53.0","In-Reply-To":"<20260423230059.3180987-1-laurent.pinchart@ideasonboard.com>","References":"<20260423230059.3180987-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::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 \nReviewed-by: Barnabás Pőcze \nReviewed-by: Isaac Scott \n---\nChanges since v2:\n\n- Drop note from GlobalConfiguration::version() documentation\n---\n include/libcamera/internal/global_configuration.h | 4 +---\n src/libcamera/global_configuration.cpp | 15 ++-------------\n src/libcamera/pipeline/simple/simple.cpp | 2 +-\n 3 files changed, 4 insertions(+), 17 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\n \tstd::optional option(\ndiff --git a/src/libcamera/global_configuration.cpp b/src/libcamera/global_configuration.cpp\nindex 4d154c026e44..a70562614b12 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@@ -153,12 +145,9 @@ unsigned int GlobalConfiguration::version() const\n * The requested part of the configuration can be accessed using \\a ValueNode\n * methods.\n *\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 top-level configuration option\n+ * \\return The global configuration\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 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();\n","prefixes":["v3","31/37"]}