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

Message ID 20190430183746.28518-6-laurent.pinchart@ideasonboard.com
State Accepted
Commit 83f8c09c2f67faad5acad6f51db2ddb66a135c0a
Headers show
Series
  • Miscellaneous cleanups and refactoring
Related show

Commit Message

Laurent Pinchart April 30, 2019, 6:37 p.m. UTC
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@ideasonboard.com>
---
 src/qcam/main_window.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Niklas Söderlund April 30, 2019, 6:59 p.m. UTC | #1
Hi Laurent,

Thanks for your work.

On 2019-04-30 21:37:46 +0300, Laurent Pinchart wrote:
> 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@ideasonboard.com>

Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>

> ---
>  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
> 
> _______________________________________________
> libcamera-devel mailing list
> libcamera-devel@lists.libcamera.org
> https://lists.libcamera.org/listinfo/libcamera-devel

Patch

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;