diff options
Diffstat (limited to 'src/cam')
| -rw-r--r-- | src/cam/stream_options.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/cam/stream_options.cpp b/src/cam/stream_options.cpp index b90dbb97..150bd27c 100644 --- a/src/cam/stream_options.cpp +++ b/src/cam/stream_options.cpp @@ -40,12 +40,12 @@ KeyValueParser::Options StreamKeyValueParser::parse(const char *arguments) StreamRoles StreamKeyValueParser::roles(const OptionValue &values) { - const std::vector<OptionValue> &streamParameters = values.toArray(); - /* If no configuration values to examine default to viewfinder. */ - if (streamParameters.empty()) + if (values.empty()) return { StreamRole::Viewfinder }; + const std::vector<OptionValue> &streamParameters = values.toArray(); + StreamRoles roles; for (auto const &value : streamParameters) { StreamRole role; @@ -63,17 +63,17 @@ StreamRoles StreamKeyValueParser::roles(const OptionValue &values) int StreamKeyValueParser::updateConfiguration(CameraConfiguration *config, const OptionValue &values) { - const std::vector<OptionValue> &streamParameters = values.toArray(); - if (!config) { std::cerr << "No configuration provided" << std::endl; return -EINVAL; } /* If no configuration values nothing to do. */ - if (!streamParameters.size()) + if (values.empty()) return 0; + const std::vector<OptionValue> &streamParameters = values.toArray(); + if (config->size() != streamParameters.size()) { std::cerr << "Number of streams in configuration " |