From patchwork Tue Apr 30 18:37:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 1145 Return-Path: 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 2CBED60E5B for ; Tue, 30 Apr 2019 20:38:03 +0200 (CEST) Received: from pendragon.station (net-37-182-44-227.cust.vodafonedsl.it [37.182.44.227]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id CA3E631D for ; Tue, 30 Apr 2019 20:38:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1556649482; bh=HXdED7P6OLWGrfcufof3GYhShjfQq3Q9A8aD1Tmk5Y4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LNQqXLl7452N9kbBivTIhqGaH2r9v/j+tlQoUeIPBJCrDCuS4NiBJUzBihgzCAUkf NnmZ65/+brqk5ZhPZQSwf0Sn0VkR3/z33oj25uj5Yhb+6sVxncRtRoRjGouDZcdG3M 5EL3PNAb1xCnHsrqGdcULYXKbLaLIPRMyGAG1LfE= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Tue, 30 Apr 2019 21:37:46 +0300 Message-Id: <20190430183746.28518-6-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190430183746.28518-1-laurent.pinchart@ideasonboard.com> References: <20190430183746.28518-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 5/5] (q)cam: Unify naming of configurations in applications X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2019 18:38:03 -0000 Name all instances of CameraConfiguration "config", and all instances of StreamConfiguration "cfg" accross the cam and qcam applications. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/qcam/main_window.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 6e92f6a1124d..ee06d751672b 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -105,9 +105,9 @@ int MainWindow::startCapture() return ret; } - const StreamConfiguration &sconf = config_[stream]; - ret = viewfinder_->setFormat(sconf.pixelFormat, sconf.size.width, - sconf.size.height); + const StreamConfiguration &cfg = config_[stream]; + ret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width, + cfg.size.height); if (ret < 0) { std::cout << "Failed to set viewfinder format" << std::endl; return ret;