summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS3
-rw-r--r--tools/lv2apply.c14
-rw-r--r--tools/lv2bench.c6
-rw-r--r--tools/lv2info.c12
-rw-r--r--tools/lv2ls.c8
5 files changed, 22 insertions, 21 deletions
diff --git a/NEWS b/NEWS
index c22de55..e464c83 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,11 @@
lilv (0.24.21) unstable; urgency=medium
+ * Clean up inconsistent tool command line interfaces
* Fix dependencies in pkg-config file
* Fix potential crash when writing state files fails
* Override pkg-config dependency within meson
- -- David Robillard <d@drobilla.net> Tue, 15 Nov 2022 20:21:29 +0000
+ -- David Robillard <d@drobilla.net> Tue, 29 Nov 2022 20:17:07 +0000
lilv (0.24.20) stable; urgency=medium
diff --git a/tools/lv2apply.c b/tools/lv2apply.c
index 1be5d0d..9c74bf3 100644
--- a/tools/lv2apply.c
+++ b/tools/lv2apply.c
@@ -206,11 +206,11 @@ print_usage(int status)
fprintf(status ? stderr : stdout,
"Usage: lv2apply [OPTION]... PLUGIN_URI\n"
"Apply an LV2 plugin to an audio file.\n\n"
- " -i IN_FILE Input file\n"
- " -o OUT_FILE Output file\n"
- " -c SYM VAL Control value\n"
- " --help Display this help and exit\n"
- " --version Display version information and exit\n");
+ " -V, --version Display version information and exit\n"
+ " -c SYM VAL Control value\n"
+ " -h, --help Display this help and exit\n"
+ " -i IN_FILE Input file\n"
+ " -o OUT_FILE Output file\n");
return status;
}
@@ -223,13 +223,13 @@ main(int argc, char** argv)
/* Parse command line arguments */
const char* plugin_uri = NULL;
for (int i = 1; i < argc; ++i) {
- if (!strcmp(argv[i], "--version")) {
+ if (!strcmp(argv[i], "-V") || !strcmp(argv[i], "--version")) {
free(self.params);
print_version();
return 0;
}
- if (!strcmp(argv[i], "--help")) {
+ if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
free(self.params);
return print_usage(0);
}
diff --git a/tools/lv2bench.c b/tools/lv2bench.c
index dcf3d96..7a23025 100644
--- a/tools/lv2bench.c
+++ b/tools/lv2bench.c
@@ -45,11 +45,11 @@ print_usage(void)
printf("lv2bench - Benchmark all installed and supported LV2 plugins.\n");
printf("Usage: lv2bench [OPTIONS] [PLUGIN_URI]\n");
printf("\n");
+ printf(" -V, --version Display version information and exit\n");
printf(" -b BLOCK_SIZE Specify block size, in audio frames.\n");
printf(" -f, --full Full plottable output.\n");
printf(" -h, --help Display this help and exit.\n");
printf(" -n FRAMES Total number of audio frames to process\n");
- printf(" --version Display version information and exit\n");
}
static double
@@ -201,12 +201,12 @@ main(int argc, char** argv)
int a = 1;
for (; a < argc; ++a) {
- if (!strcmp(argv[a], "--version")) {
+ if (!strcmp(argv[a], "-V") || !strcmp(argv[a], "--version")) {
print_version();
return 0;
}
- if (!strcmp(argv[a], "--help")) {
+ if (!strcmp(argv[a], "-h") || !strcmp(argv[a], "--help")) {
print_usage();
return 0;
}
diff --git a/tools/lv2info.c b/tools/lv2info.c
index 60a178e..55acd09 100644
--- a/tools/lv2info.c
+++ b/tools/lv2info.c
@@ -330,10 +330,10 @@ print_usage(void)
{
printf("Usage: lv2info [OPTION]... PLUGIN_URI\n"
"Print information about an installed LV2 plugin.\n\n"
- " -p FILE Write Turtle description of plugin to FILE\n"
- " -m FILE Add record of plugin to manifest FILE\n"
- " --help Display this help and exit\n"
- " --version Display version information and exit\n\n"
+ " -V, --version Display version information and exit\n"
+ " -h, --help Display this help and exit\n"
+ " -m FILE Add record of plugin to manifest FILE\n"
+ " -p FILE Write Turtle description of plugin to FILE\n\n"
"For -p and -m, Turtle files are appended to (not overwritten),\n"
"and @prefix directives are only written if the file was empty.\n"
"This allows several plugins to be added to a single file.\n");
@@ -351,12 +351,12 @@ main(int argc, char** argv)
const char* manifest_file = NULL;
const char* plugin_uri = NULL;
for (int i = 1; i < argc; ++i) {
- if (!strcmp(argv[i], "--version")) {
+ if (!strcmp(argv[i], "-V") || !strcmp(argv[i], "--version")) {
print_version();
return 0;
}
- if (!strcmp(argv[i], "--help")) {
+ if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
print_usage();
return 0;
}
diff --git a/tools/lv2ls.c b/tools/lv2ls.c
index e4a5f4b..8203262 100644
--- a/tools/lv2ls.c
+++ b/tools/lv2ls.c
@@ -40,9 +40,9 @@ print_usage(void)
printf("Usage: lv2ls [OPTION]...\n");
printf("List all installed LV2 plugins.\n");
printf("\n");
+ printf(" -V, --version Display version information and exit\n");
+ printf(" -h, --help Display this help and exit\n");
printf(" -n, --names Show names instead of URIs\n");
- printf(" --help Display this help and exit\n");
- printf(" --version Display version information and exit\n");
printf("\n");
printf("The environment variable LV2_PATH can be used to control where\n");
printf(
@@ -56,10 +56,10 @@ main(int argc, char** argv)
for (int i = 1; i < argc; ++i) {
if (!strcmp(argv[i], "--names") || !strcmp(argv[i], "-n")) {
show_names = true;
- } else if (!strcmp(argv[i], "--version")) {
+ } else if (!strcmp(argv[i], "-V") || !strcmp(argv[i], "--version")) {
print_version();
return 0;
- } else if (!strcmp(argv[i], "--help")) {
+ } else if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) {
print_usage();
return 0;
} else {