summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-08-02 23:57:17 +0200
committerNiklas Söderlund <niklas.soderlund@ragnatech.se>2020-08-05 20:07:13 +0200
commit2e7c80a4f9d4f50a82c674863ce159856c748873 (patch)
treeed342559a62d42a4bbdff87be1431f95e23bcf07 /src/android
parent53d38b19ed5b2650ad419db9cd91cf9d3392c877 (diff)
libcamera: camera: Rename name() to id()
Rename Camera::name() to camera::id() to better describe what it represents, a unique and stable ID for the camera. While at it improve the documentation for the camera ID to describe it needs to be stable for a camera between resets of the system. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/android')
-rw-r--r--src/android/camera_device.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp
index c1e58126..e96ffc55 100644
--- a/src/android/camera_device.cpp
+++ b/src/android/camera_device.cpp
@@ -1108,7 +1108,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
int ret = camera_->configure(config_.get());
if (ret) {
LOG(HAL, Error) << "Failed to configure camera '"
- << camera_->name() << "'";
+ << camera_->id() << "'";
return ret;
}
@@ -1276,7 +1276,7 @@ void CameraDevice::requestComplete(Request *request)
std::string CameraDevice::logPrefix() const
{
- return "'" + camera_->name() + "'";
+ return "'" + camera_->id() + "'";
}
void CameraDevice::notifyShutter(uint32_t frameNumber, uint64_t timestamp)