diff options
| author | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-08-02 23:57:17 +0200 |
|---|---|---|
| committer | Niklas Söderlund <niklas.soderlund@ragnatech.se> | 2020-08-05 20:07:13 +0200 |
| commit | 2e7c80a4f9d4f50a82c674863ce159856c748873 (patch) | |
| tree | ed342559a62d42a4bbdff87be1431f95e23bcf07 /src/cam | |
| parent | 53d38b19ed5b2650ad419db9cd91cf9d3392c877 (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/cam')
| -rw-r--r-- | src/cam/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cam/main.cpp b/src/cam/main.cpp index 6761d638..fb7bcbd9 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -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++; } } |