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-02 23:57:17 +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/cam/main.cpp
+5 -5
View File
@@ -117,7 +117,7 @@ int CamApp::init(int argc, char **argv)
return -EINVAL;
}
std::cout << "Using camera " << camera_->name() << std::endl;
std::cout << "Using camera " << camera_->id() << std::endl;
ret = prepareConfig();
if (ret) {
@@ -174,7 +174,7 @@ int CamApp::parseOptions(int argc, char *argv[])
OptionsParser parser;
parser.addOption(OptCamera, OptionString,
"Specify which camera to operate on, by name or by index", "camera",
"Specify which camera to operate on, by id or by index", "camera",
ArgumentRequired, "camera");
parser.addOption(OptCapture, OptionInteger,
"Capture until interrupted by user or until <count> frames captured",
@@ -323,12 +323,12 @@ int CamApp::infoConfiguration()
void CamApp::cameraAdded(std::shared_ptr<Camera> cam)
{
std::cout << "Camera Added: " << cam->name() << std::endl;
std::cout << "Camera Added: " << cam->id() << std::endl;
}
void CamApp::cameraRemoved(std::shared_ptr<Camera> cam)
{
std::cout << "Camera Removed: " << cam->name() << std::endl;
std::cout << "Camera Removed: " << cam->id() << std::endl;
}
int CamApp::run()
@@ -340,7 +340,7 @@ int CamApp::run()
unsigned int index = 1;
for (const std::shared_ptr<Camera> &cam : cm_->cameras()) {
std::cout << index << ": " << cam->name() << std::endl;
std::cout << index << ": " << cam->id() << std::endl;
index++;
}
}