scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 10:40:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't return failure on '--audio-capture-format help'

Browse Source
This commit is contained in:
Martin Pulec
2022-10-17 10:00:50 +02:00
parent aeadbe0b62
commit b07ce59da7
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/host.cpp
View File

@@ -227,13 +227,18 @@ static void load_libgcc()
#endif
}
bool parse_audio_capture_format(const char *optarg)
/**
* @retval -1 invalid usage
* @retval 0 success
* @retval 1 help was printed
*/
int parse_audio_capture_format(const char *optarg)
{
if (strcmp(optarg, "help") == 0) {
printf("Usage:\n");
printf("\t--audio-capture-format {channels=<num>|bps=<bits_per_sample>|sample_rate=<rate>}*\n");
printf("\t\tmultiple options can be separated by a colon\n");
return false;
return 1;
}
unique_ptr<char[]> arg_copy(new char[strlen(optarg) + 1]);
@@ -251,7 +256,7 @@ bool parse_audio_capture_format(const char *optarg)
audio_capture_channels = strtol(item, &endptr, 10);
if (audio_capture_channels < 1 || endptr != item + strlen(item)) {
log_msg(LOG_LEVEL_ERROR, "Invalid number of channels %s!\n", item);
return false;
return -1;
}
} else if (strncmp(item, "bps=", strlen("bps=")) == 0) {
item += strlen("bps=");
@@ -262,7 +267,7 @@ bool parse_audio_capture_format(const char *optarg)
LOG(LOG_LEVEL_WARNING) << "bps is in bits per sample but a value not divisible by 8 was given.\n";
}
log_msg(LOG_LEVEL_ERROR, "Supported values are 8, 16, 24, or 32 bits.\n");
return false;
return -1;
}
audio_capture_bps = bps / 8;
@@ -271,18 +276,18 @@ bool parse_audio_capture_format(const char *optarg)
long long val = unit_evaluate(sample_rate_str);
if (val <= 0 || val > numeric_limits<decltype(audio_capture_sample_rate)>::max()) {
LOG(LOG_LEVEL_ERROR) << "Invalid sample_rate " << sample_rate_str << "!\n";
return false;
return -1;
}
audio_capture_sample_rate = val;
} else {
LOG(LOG_LEVEL_ERROR) << "Unkonwn option \"" << item << "\" for --audio-capture-format!\n";
return false;
return -1;
}
tmp = nullptr;
}
return true;
return 0;
}
/**

2
src/host.h
View File

@@ -143,7 +143,7 @@ void print_configuration(void);
const char *get_commandline_param(const char *key);
bool parse_audio_capture_format(const char *optarg);
int parse_audio_capture_format(const char *optarg);
bool parse_params(const char *optarg, bool preinit);
void print_pixel_formats(void);
void print_video_codecs(void);

4
src/main.cpp
View File

@@ -1009,8 +1009,8 @@ static int parse_options(int argc, char *argv[], struct ug_options *opt) {
}
break;
case OPT_AUDIO_CAPTURE_FORMAT:
if (!parse_audio_capture_format(optarg)) {
return -EXIT_FAIL_USAGE;
if (int ret = parse_audio_capture_format(optarg)) {
return ret < 0 ? -EXIT_FAIL_USAGE : 1;
}
break;
case OPT_AUDIO_FILTER: