NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

cam: Allow selecting cameras by index

Browse source 
As camera names can be cumbersome to type, selection of cameras by index
from a list can be useful. Print the list of detected cameras with an
index for each item, and interpret the camera name as an index if it is
a numerical value in the range from 1 to the number of cameras.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-06-17 13:07:31 +03:00
parent b2b3599b5b
commit c6090542cd
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/cam/main.cpp
View file

@ -73,7 +73,14 @@ int CamApp::init(int argc, char **argv)
}
if (options_.isSet(OptCamera)) {
camera_ = cm_->get(options_[OptCamera]);
const std::string &cameraName = options_[OptCamera];
char *endptr;
unsigned long index = strtoul(cameraName.c_str(), &endptr, 10);
if (*endptr == '\0' && index > 0 && index <= cm_->cameras().size())
camera_ = cm_->cameras()[index - 1];
else
camera_ = cm_->get(cameraName);
if (!camera_) {
std::cout << "Camera "
<< std::string(options_[OptCamera])
@ -141,7 +148,7 @@ int CamApp::parseOptions(int argc, char *argv[])
OptionsParser parser;
parser.addOption(OptCamera, OptionString,
"Specify which camera to operate on", "camera",
"Specify which camera to operate on, by name or by index", "camera",
ArgumentRequired, "camera");
parser.addOption(OptCapture, OptionNone,
"Capture until interrupted by user", "capture");
@ -172,8 +179,12 @@ int CamApp::run()
{
if (options_.isSet(OptList)) {
std::cout << "Available cameras:" << std::endl;
for (const std::shared_ptr<Camera> &cam : cm_->cameras())
std::cout << "- " << cam->name() << std::endl;
unsigned int index = 1;
for (const std::shared_ptr<Camera> &cam : cm_->cameras()) {
std::cout << index << ": " << cam->name() << std::endl;
index++;
}
}
if (options_.isSet(OptCapture)) {