{"id":463,"url":"https://patchwork.libcamera.org/api/patches/463/?format=json","web_url":"https://patchwork.libcamera.org/patch/463/","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":"<20190131234721.22606-4-laurent.pinchart@ideasonboard.com>","date":"2019-01-31T23:47:16","name":"[libcamera-devel,v2,3/8] cam: options: Create a template class for options","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5819bd58583920a0fd1a2772495cd2e9cd7defe6","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/463/mbox/","series":[{"id":158,"url":"https://patchwork.libcamera.org/api/series/158/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=158","date":"2019-01-31T23:47:13","name":"cam: add --format option to configure a stream","version":2,"mbox":"https://patchwork.libcamera.org/series/158/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/463/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/463/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 73FE960DC0\n\tfor ;\n\tFri, 1 Feb 2019 00:47:37 +0100 (CET)","from pendragon.ideasonboard.com (85-76-34-136-nat.elisa-mobile.fi\n\t[85.76.34.136])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B04B1324;\n\tFri, 1 Feb 2019 00:47:35 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1548978457;\n\tbh=QXaS7jOZnhNoLqFpuZVS4Ixfx5GhgoGKq/YpMIJT6+k=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=q4JqPC9/NgL7WDTIKgYXJ+3oiWp83GgKqsC1aDgVPsjQnJgCopMaECBnp1Mcp+7RS\n\tfy7UOjuaeeYqVsvOBO3Hs3kWO4C3cz6pMTCu4FXKJoO/c56n3qzK56HsC1Oye85+Si\n\tLDZmQVBCRpJ8vGKSFfdL/KKXNiK1gmoPA37ca41w=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 1 Feb 2019 01:47:16 +0200","Message-Id":"<20190131234721.22606-4-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.19.2","In-Reply-To":"<20190131234721.22606-1-laurent.pinchart@ideasonboard.com>","References":"<20190131234721.22606-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 3/8] cam: options: Create a template\n\tclass for options","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":"Thu, 31 Jan 2019 23:47:37 -0000"},"content":"From: Niklas Söderlund \n\nIn preparation to adding more parsers create a template class to hold\nthe parsed information. The rational for making it a template are that\ndifferent parsers can index the options using different data types.\n\nThe OptionsParser index its options using an int while the upcoming\nKeyValyeParser will index its options using strings for example.\n\nSigned-off-by: Niklas Söderlund \nSigned-off-by: Laurent Pinchart \n---\nChanges since v1:\n\n- Don't inline the OptionsBase member functions\n- Replace class with typename in the OptionsBase template definition\n- Pass a const T & to isSet() and operator[]()\n---\n src/cam/options.cpp | 50 +++++++++++++++++++++++----------------------\n src/cam/options.h | 28 ++++++++++++++-----------\n 2 files changed, 42 insertions(+), 36 deletions(-)","diff":"diff --git a/src/cam/options.cpp b/src/cam/options.cpp\nindex 83601270207b..f48bd1fcf1b4 100644\n--- a/src/cam/options.cpp\n+++ b/src/cam/options.cpp\n@@ -12,6 +12,32 @@\n \n #include \"options.h\"\n \n+template \n+bool OptionsBase::valid() const\n+{\n+\treturn !values_.empty();\n+}\n+\n+template \n+bool OptionsBase::isSet(const T &opt) const\n+{\n+\treturn values_.find(opt) != values_.end();\n+}\n+\n+template \n+const std::string &OptionsBase::operator[](const T &opt) const\n+{\n+\treturn values_.find(opt)->second;\n+}\n+\n+template \n+void OptionsBase::clear()\n+{\n+\tvalues_.clear();\n+}\n+\n+template class OptionsBase;\n+\n void OptionsParser::addOption(int opt, const char *help, const char *name,\n \t\t\t OptionArgument argument, const char *argumentName)\n {\n@@ -166,27 +192,3 @@ void OptionsParser::usage()\n \t\t}\n \t}\n }\n-\n-OptionsParser::Options::Options()\n-{\n-}\n-\n-bool OptionsParser::Options::valid() const\n-{\n-\treturn !values_.empty();\n-}\n-\n-bool OptionsParser::Options::isSet(int opt) const\n-{\n-\treturn values_.find(opt) != values_.end();\n-}\n-\n-const std::string &OptionsParser::Options::operator[](int opt) const\n-{\n-\treturn values_.find(opt)->second;\n-}\n-\n-void OptionsParser::Options::clear()\n-{\n-\tvalues_.clear();\n-}\ndiff --git a/src/cam/options.h b/src/cam/options.h\nindex 6d1b12d235d8..2bf1f160f3c0 100644\n--- a/src/cam/options.h\n+++ b/src/cam/options.h\n@@ -28,21 +28,25 @@ struct Option {\n \tbool hasLongOption() const { return name != nullptr; }\n };\n \n+template \n+class OptionsBase\n+{\n+public:\n+\tbool valid() const;\n+\tbool isSet(const T &opt) const;\n+\tconst std::string &operator[](const T &opt) const;\n+\n+private:\n+\tfriend class OptionsParser;\n+\tstd::map values_;\n+\tvoid clear();\n+};\n+\n class OptionsParser\n {\n public:\n-\tclass Options {\n-\tpublic:\n-\t\tOptions();\n-\n-\t\tbool valid() const;\n-\t\tbool isSet(int opt) const;\n-\t\tconst std::string &operator[](int opt) const;\n-\n-\tprivate:\n-\t\tfriend class OptionsParser;\n-\t\tstd::map values_;\n-\t\tvoid clear();\n+\tclass Options : public OptionsBase\n+\t{\n \t};\n \n \tvoid addOption(int opt, const char *help, const char *name = nullptr,\n","prefixes":["libcamera-devel","v2","3/8"]}