From 45662c4dd757cff33ebbf296c8f656c17c9022b5 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 12 Oct 2021 04:23:47 +0300 Subject: cam: Rename CameraSession::streamName_ to streamNames_ The streamName_ map contains names for all streams, rename it to streamNames_ to make this more explicit. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 8 ++++---- src/cam/camera_session.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/cam') diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 32a373a9..5a25baab 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 2ccc7197..a7f92d61 100644 --- a/src/cam/camera_session.h +++ b/src/cam/camera_session.h @@ -60,7 +60,7 @@ private: std::shared_ptr camera_; std::unique_ptr config_; - std::map streamName_; + std::map streamNames_; std::unique_ptr sink_; unsigned int cameraIndex_; -- cgit v1.2.1