[libcamera-devel] [PATCH 1/3] cam: Rename CameraSession::streamName_ to streamNames_

[Kieran Bingham]

Quoting Laurent Pinchart (2021-10-12 03:23:19)
> The streamName_ map contains names for all streams, rename it to
> streamNames_ to make this more explicit.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>

Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>

> ---
>  src/cam/camera_session.cpp | 8 ++++----
>  src/cam/camera_session.h   | 2 +-
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp
> index 32a373a99b72..5a25baab03f5 100644
> --- a/src/cam/camera_session.cpp
> +++ b/src/cam/camera_session.cpp
> @@ -177,11 +177,11 @@ int CameraSession::start()
>                 return ret;
>         }
>  
> -       streamName_.clear();
> +       streamNames_.clear();
>         for (unsigned int index = 0; index < config_->size(); ++index) {
>                 StreamConfiguration &cfg = config_->at(index);
> -               streamName_[cfg.stream()] = "cam" + std::to_string(cameraIndex_)
> -                                         + "-stream" + std::to_string(index);
> +               streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_)
> +                                          + "-stream" + std::to_string(index);
>         }
>  
>         camera_->requestCompleted.connect(this, &CameraSession::requestComplete);
> @@ -369,7 +369,7 @@ void CameraSession::processRequest(Request *request)
>  
>                 const FrameMetadata &metadata = buffer->metadata();
>  
> -               info << " " << streamName_[stream]
> +               info << " " << streamNames_[stream]
>                      << " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence
>                      << " bytesused: ";
>  
> diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h
> index 2ccc71977a99..a7f92d61307e 100644
> --- a/src/cam/camera_session.h
> +++ b/src/cam/camera_session.h
> @@ -60,7 +60,7 @@ private:
>         std::shared_ptr<libcamera::Camera> camera_;
>         std::unique_ptr<libcamera::CameraConfiguration> config_;
>  
> -       std::map<const libcamera::Stream *, std::string> streamName_;
> +       std::map<const libcamera::Stream *, std::string> streamNames_;
>         std::unique_ptr<FrameSink> sink_;
>         unsigned int cameraIndex_;
>  
> -- 
> Regards,
> 
> Laurent Pinchart
>