{"id":791,"url":"https://patchwork.libcamera.org/api/1.1/patches/791/?format=json","web_url":"https://patchwork.libcamera.org/patch/791/","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":"<20190325234736.12533-3-niklas.soderlund@ragnatech.se>","date":"2019-03-25T23:47:35","name":"[libcamera-devel,2/3] cam: options: Add an array data type to OptionValue","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"7ec925a790d4545dfa33a070e2093dbc23140b88","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/791/mbox/","series":[{"id":218,"url":"https://patchwork.libcamera.org/api/1.1/series/218/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=218","date":"2019-03-25T23:47:35","name":"cam: options: Add support for repeatable options","version":1,"mbox":"https://patchwork.libcamera.org/series/218/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/791/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/791/checks/","tags":{},"headers":{"Return-Path":"","Received":["from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D03D6600FD\n\tfor ;\n\tTue, 26 Mar 2019 00:47:46 +0100 (CET)","from bismarck.berto.se (unknown [89.233.230.99])\n\tby bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid 628f838a-4f58-11e9-846a-005056917a89;\n\tTue, 26 Mar 2019 00:47:44 +0100 (CET)"],"X-Halon-ID":"628f838a-4f58-11e9-846a-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 26 Mar 2019 00:47:35 +0100","Message-Id":"<20190325234736.12533-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.21.0","In-Reply-To":"<20190325234736.12533-1-niklas.soderlund@ragnatech.se>","References":"<20190325234736.12533-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/3] cam: options: Add an array data type\n\tto OptionValue","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Mon, 25 Mar 2019 23:47:47 -0000"},"content":"To allow specifying the same argument option multiple times a new type\nof OptionValue is needed. As parsing of options is an iterative process\nthere is a need to append options as they are parsed so instead of\nsetting values using the constructor a new add() method is used.\n\nSigned-off-by: Niklas Söderlund \n---\n src/cam/options.cpp | 19 +++++++++++++++++++\n src/cam/options.h | 7 +++++++\n 2 files changed, 26 insertions(+)","diff":"diff --git a/src/cam/options.cpp b/src/cam/options.cpp\nindex 497833397d894f82..0dec154815d3cad5 100644\n--- a/src/cam/options.cpp\n+++ b/src/cam/options.cpp\n@@ -272,6 +272,12 @@ OptionValue::OptionValue(const KeyValueParser::Options &value)\n {\n }\n \n+void OptionValue::add(const OptionValue &value)\n+{\n+\ttype_ = ValueArray;\n+\tarray_.push_back(value);\n+}\n+\n OptionValue::operator int() const\n {\n \treturn toInteger();\n@@ -287,6 +293,11 @@ OptionValue::operator KeyValueParser::Options() const\n \treturn toKeyValues();\n }\n \n+OptionValue::operator std::vector() const\n+{\n+\treturn toArray();\n+}\n+\n int OptionValue::toInteger() const\n {\n \tif (type_ != ValueInteger)\n@@ -311,6 +322,14 @@ KeyValueParser::Options OptionValue::toKeyValues() const\n \treturn keyValues_;\n }\n \n+std::vector OptionValue::toArray() const\n+{\n+\tif (type_ != ValueArray)\n+\t\treturn std::vector{};\n+\n+\treturn array_;\n+}\n+\n /* -----------------------------------------------------------------------------\n * OptionsParser\n */\ndiff --git a/src/cam/options.h b/src/cam/options.h\nindex b33a90fc6058febf..6a887416c0070c41 100644\n--- a/src/cam/options.h\n+++ b/src/cam/options.h\n@@ -10,6 +10,7 @@\n #include \n #include \n #include \n+#include \n \n class KeyValueParser;\n class OptionValue;\n@@ -84,6 +85,7 @@ public:\n \t\tValueInteger,\n \t\tValueString,\n \t\tValueKeyValue,\n+\t\tValueArray,\n \t};\n \n \tOptionValue();\n@@ -92,21 +94,26 @@ public:\n \tOptionValue(const std::string &value);\n \tOptionValue(const KeyValueParser::Options &value);\n \n+\tvoid add(const OptionValue &value);\n+\n \tValueType type() const { return type_; }\n \n \toperator int() const;\n \toperator std::string() const;\n \toperator KeyValueParser::Options() const;\n+\toperator std::vector() const;\n \n \tint toInteger() const;\n \tstd::string toString() const;\n \tKeyValueParser::Options toKeyValues() const;\n+\tstd::vector toArray() const;\n \n private:\n \tValueType type_;\n \tint integer_;\n \tstd::string string_;\n \tKeyValueParser::Options keyValues_;\n+\tstd::vector array_;\n };\n \n class OptionsParser\n","prefixes":["libcamera-devel","2/3"]}