PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: camera: Rename name() to id()

Browse Source 
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>
This commit is contained in:
Niklas Söderlund
2020-08-05 20:07:13 +02:00
parent 53d38b19ed
commit 2e7c80a4f9
17 changed files with 91 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/camera_manager.cpp
+8 -8
View File
@@ -181,10 +181,10 @@ void CameraManager::Private::addCamera(std::shared_ptr<Camera> camera,
MutexLocker locker(mutex_);
for (std::shared_ptr<Camera> c : cameras_) {
if (c->name() == camera->name()) {
if (c->id() == camera->id()) {
LOG(Camera, Warning)
<< "Registering camera with duplicate name '"
<< camera->name() << "'";
<< "Registering camera with duplicate ID '"
<< camera->id() << "'";
break;
}
}
@@ -208,7 +208,7 @@ void CameraManager::Private::removeCamera(Camera *camera)
return;
LOG(Camera, Debug)
<< "Unregistering camera '" << camera->name() << "'";
<< "Unregistering camera '" << camera->id() << "'";
auto iter_d = std::find_if(camerasByDevnum_.begin(), camerasByDevnum_.end(),
[camera](const std::pair<dev_t, std::weak_ptr<Camera>> &p) {
@@ -329,8 +329,8 @@ std::vector<std::shared_ptr<Camera>> CameraManager::cameras() const
}
/**
* \brief Get a camera based on name
* \param[in] name Name of camera to get
* \brief Get a camera based on ID
* \param[in] id ID of camera to get
*
* Before calling this function the caller is responsible for ensuring that
* the camera manager is running.
@@ -339,12 +339,12 @@ std::vector<std::shared_ptr<Camera>> CameraManager::cameras() const
*
* \return Shared pointer to Camera object or nullptr if camera not found
*/
std::shared_ptr<Camera> CameraManager::get(const std::string &name)
std::shared_ptr<Camera> CameraManager::get(const std::string &id)
{
MutexLocker locker(p_->mutex_);
for (std::shared_ptr<Camera> camera : p_->cameras_) {
if (camera->name() == name)
if (camera->id() == id)
return camera;
}