summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-21 16:18:01 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-05-23 11:39:46 +0300
commit8d846ed8a7d9d7c9783472a618a7f369f0843e67 (patch)
tree0ce11f1d78a3e22d350c913ea5eec54dec2a9d24
parent2b1a908b5222e26317d761a18e91d6ede93b6e16 (diff)
cam: Rename conf variable referring to command line option to opt
Naming a variable that refers to command line options 'conf' is confusing as we using 'config' and 'cfg' to refer to camera and stream configurations. Rename it to 'opt'. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--src/cam/main.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/cam/main.cpp b/src/cam/main.cpp
index 5ecd7e0e..41558896 100644
--- a/src/cam/main.cpp
+++ b/src/cam/main.cpp
@@ -98,19 +98,19 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()
/* Use roles and get a default configuration. */
for (auto const &value : streamOptions) {
- KeyValueParser::Options conf = value.toKeyValues();
+ KeyValueParser::Options opt = value.toKeyValues();
- if (!conf.isSet("role")) {
+ if (!opt.isSet("role")) {
roles.push_back(StreamRole::VideoRecording);
- } else if (conf["role"].toString() == "viewfinder") {
+ } else if (opt["role"].toString() == "viewfinder") {
roles.push_back(StreamRole::Viewfinder);
- } else if (conf["role"].toString() == "video") {
+ } else if (opt["role"].toString() == "video") {
roles.push_back(StreamRole::VideoRecording);
- } else if (conf["role"].toString() == "still") {
+ } else if (opt["role"].toString() == "still") {
roles.push_back(StreamRole::StillCapture);
} else {
std::cerr << "Unknown stream role "
- << conf["role"].toString() << std::endl;
+ << opt["role"].toString() << std::endl;
return nullptr;
}
}
@@ -125,18 +125,18 @@ static std::unique_ptr<CameraConfiguration> prepareCameraConfig()
/* Apply configuration explicitly requested. */
unsigned int i = 0;
for (auto const &value : streamOptions) {
- KeyValueParser::Options conf = value.toKeyValues();
+ KeyValueParser::Options opt = value.toKeyValues();
StreamConfiguration &cfg = config->at(i++);
- if (conf.isSet("width"))
- cfg.size.width = conf["width"];
+ if (opt.isSet("width"))
+ cfg.size.width = opt["width"];
- if (conf.isSet("height"))
- cfg.size.height = conf["height"];
+ if (opt.isSet("height"))
+ cfg.size.height = opt["height"];
/* TODO: Translate 4CC string to ID. */
- if (conf.isSet("pixelformat"))
- cfg.pixelFormat = conf["pixelformat"];
+ if (opt.isSet("pixelformat"))
+ cfg.pixelFormat = opt["pixelformat"];
}
return config;