Message ID | 20210712215645.30478-23-laurent.pinchart@ideasonboard.com |
---|---|
State | Superseded |
Headers | show
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 [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id C9C9EC3229 for <parsemail@patchwork.libcamera.org>; Mon, 12 Jul 2021 21:57:56 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 710DC68542; Mon, 12 Jul 2021 23:57:56 +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="IO9youMX"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3A96968525 for <libcamera-devel@lists.libcamera.org>; Mon, 12 Jul 2021 23:57:43 +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 B98733F1 for <libcamera-devel@lists.libcamera.org>; Mon, 12 Jul 2021 23:57:42 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626127063; bh=jOy4SyKjUDyf+//EBxL2A6r7aABK3WzCl6iZMitMA/w=; h=From:To:Subject:Date:In-Reply-To:References:From; b=IO9youMXvOFdfu3D5BUpnxQKo1jC0e+IRbjUB8xf3iOqThn318/pHo8iZAEOoQLan Dz0M+N+TmRL7iZEpkU45IrpJFZlrLaUrOqHxVD+L9A6uQYSk+ne3+oAUFuKXf+lStV Ln/KemZ3kXhtRc5X4i58vv7C0vXIzyARdBKumKHM= From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: libcamera-devel@lists.libcamera.org Date: Tue, 13 Jul 2021 00:56:37 +0300 Message-Id: <20210712215645.30478-23-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 Content-Transfer-Encoding: 8bit Subject: [libcamera-devel] [PATCH v2 22/30] cam: Make CamApp::cameraName() static 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>, <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>, <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> |
Series |
|
Related |
show
|
diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 19ed9837cf4f..03e62f305f24 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -44,7 +44,7 @@ private: int infoConfiguration(); int run(); - std::string const cameraName(const Camera *camera); + static std::string cameraName(const Camera *camera); static CamApp *app_; OptionsParser::Options options_; @@ -319,7 +319,7 @@ int CamApp::run() return 0; } -std::string const CamApp::cameraName(const Camera *camera) +std::string CamApp::cameraName(const Camera *camera) { const ControlList &props = camera->properties(); bool addModel = true;