[libcamera-devel] [PATCH 5/5] (q)cam: Unify naming of configurations in applications

Laurent Pinchart laurent.pinchart at ideasonboard.com
Tue Apr 30 20:37:46 CEST 2019


Name all instances of CameraConfiguration "config", and all instances of
StreamConfiguration "cfg" accross the cam and qcam applications.

Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
---
 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;
-- 
Regards,

Laurent Pinchart



More information about the libcamera-devel mailing list