From patchwork Mon Jul 12 21:56:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 12923 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id AB65AC3227 for ; Mon, 12 Jul 2021 21:57:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id E0F2D68535; Mon, 12 Jul 2021 23:57:45 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="BJa66u5B"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 375C068524 for ; Mon, 12 Jul 2021 23:57:39 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CB38ECC for ; Mon, 12 Jul 2021 23:57:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626127059; bh=u/EKlYW1O9mTY+f8DbJqsRgDxxZ0Th5N2SH8PLdqrJE=; h=From:To:Subject:Date:In-Reply-To:References:From; b=BJa66u5B7MEZna/nJiuCObG5W3SRcWXObQjjlvmye/652a+JUBe0bk/xqogG1GVHL vDnWhBhg2KphmDZ1gxZAT7eq409zLva7KHlmwJ46s6ojIL8gckr1QqiH6Xf4KRSbAX uDWo5MQF/ViwGNaahexoJoYPVk3ljTyoaPeIdiCg= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Jul 2021 00:56:25 +0300 Message-Id: <20210712215645.30478-11-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210712215645.30478-1-laurent.pinchart@ideasonboard.com> References: <20210712215645.30478-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 10/30] cam: options: Drop some OptionValue cast operators X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" While OptionValue cast operators to int and std::string allow useful shortcut syntaxes, the cast operators to KeyValueParser::Options and std::vector are less useful. A an explicit static_cast call would be more cumbersome to write than an explicit .toKeyValues() or toArray(), and implicit cast hide too much of what's going on. Drop those two cast operators, and replace the only implicit cast occurrence with .toKeyValues(). While at it, drop the local opts variable in StreamKeyValueParser::roles() as it isn't used. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/options.cpp | 20 -------------------- src/cam/options.h | 2 -- src/cam/stream_options.cpp | 3 +-- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/cam/options.cpp b/src/cam/options.cpp index 59b26be4deff..fda6d9764ac5 100644 --- a/src/cam/options.cpp +++ b/src/cam/options.cpp @@ -603,26 +603,6 @@ OptionValue::operator std::string() const return toString(); } -/** - * \brief Cast the value to a key-value list - * \return The option value as a KeyValueParser::Options, or an empty list if - * the value type isn't ValueType::ValueKeyValue - */ -OptionValue::operator KeyValueParser::Options() const -{ - return toKeyValues(); -} - -/** - * \brief Cast the value to an array - * \return The option value as a std::vector of OptionValue, or an empty vector - * if the value type isn't ValueType::ValueArray - */ -OptionValue::operator std::vector() const -{ - return toArray(); -} - /** * \brief Retrieve the value as an int * \return The option value as an int, or 0 if the value type isn't diff --git a/src/cam/options.h b/src/cam/options.h index e894822c0061..210e502a24e1 100644 --- a/src/cam/options.h +++ b/src/cam/options.h @@ -138,8 +138,6 @@ public: operator int() const; operator std::string() const; - operator KeyValueParser::Options() const; - operator std::vector() const; int toInteger() const; std::string toString() const; diff --git a/src/cam/stream_options.cpp b/src/cam/stream_options.cpp index c58272c23d25..b90dbb97f087 100644 --- a/src/cam/stream_options.cpp +++ b/src/cam/stream_options.cpp @@ -48,11 +48,10 @@ StreamRoles StreamKeyValueParser::roles(const OptionValue &values) StreamRoles roles; for (auto const &value : streamParameters) { - KeyValueParser::Options opts = value.toKeyValues(); StreamRole role; /* If role is invalid or not set default to viewfinder. */ - if (!parseRole(&role, value)) + if (!parseRole(&role, value.toKeyValues())) role = StreamRole::Viewfinder; roles.push_back(role);