summaryrefslogtreecommitdiffstats
path: root/src/progs/server/cmdline.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/progs/server/cmdline.c')
-rw-r--r--src/progs/server/cmdline.c63
1 files changed, 14 insertions, 49 deletions
diff --git a/src/progs/server/cmdline.c b/src/progs/server/cmdline.c
index 6a697a04..1e97e1ef 100644
--- a/src/progs/server/cmdline.c
+++ b/src/progs/server/cmdline.c
@@ -1,5 +1,5 @@
/*
- File autogenerated by gengetopt version 2.18
+ File autogenerated by gengetopt version 2.19.1
generated with the following command:
gengetopt -u
@@ -23,14 +23,15 @@
const char *gengetopt_args_info_purpose = "";
-const char *gengetopt_args_info_usage = "Usage: Om - An OSC controlled realtime modular synthesizer [OPTIONS]... [FILES]...";
+const char *gengetopt_args_info_usage = "Usage: Om - An OSC controlled realtime modular synthesizer [OPTIONS]... \n [FILES]...";
+
+const char *gengetopt_args_info_description = "";
const char *gengetopt_args_info_help[] = {
- " -h, --help Print help and exit",
- " -V, --version Print version and exit",
- " -p, --port=STRING OSC port to listen on (default=`16180')",
- " -j, --jack-server=STRING Name of Jack server to attach to",
- " -i, --in-jackd Run engine as in-process JACK client (default=off)",
+ " -h, --help Print help and exit",
+ " -V, --version Print version and exit",
+ " -p, --port=STRING OSC port to listen on (default=`16180')",
+ " -i, --in-jackd Run engine as in-process JACK client (default=off)",
0
};
@@ -52,7 +53,6 @@ void clear_given (struct gengetopt_args_info *args_info)
args_info->help_given = 0 ;
args_info->version_given = 0 ;
args_info->port_given = 0 ;
- args_info->jack_server_given = 0 ;
args_info->in_jackd_given = 0 ;
}
@@ -61,8 +61,6 @@ void clear_args (struct gengetopt_args_info *args_info)
{
args_info->port_arg = gengetopt_strdup ("16180");
args_info->port_orig = NULL;
- args_info->jack_server_arg = NULL;
- args_info->jack_server_orig = NULL;
args_info->in_jackd_flag = 0;
}
@@ -73,8 +71,7 @@ void init_args_info(struct gengetopt_args_info *args_info)
args_info->help_help = gengetopt_args_info_help[0] ;
args_info->version_help = gengetopt_args_info_help[1] ;
args_info->port_help = gengetopt_args_info_help[2] ;
- args_info->jack_server_help = gengetopt_args_info_help[3] ;
- args_info->in_jackd_help = gengetopt_args_info_help[4] ;
+ args_info->in_jackd_help = gengetopt_args_info_help[3] ;
}
@@ -94,6 +91,10 @@ cmdline_parser_print_help (void)
printf("\n%s\n", gengetopt_args_info_purpose);
printf("\n%s\n\n", gengetopt_args_info_usage);
+
+ if (strlen(gengetopt_args_info_description) > 0)
+ printf("%s\n", gengetopt_args_info_description);
+
while (gengetopt_args_info_help[i])
printf("%s\n", gengetopt_args_info_help[i++]);
}
@@ -124,16 +125,6 @@ cmdline_parser_release (struct gengetopt_args_info *args_info)
free (args_info->port_orig); /* free previous argument */
args_info->port_orig = 0;
}
- if (args_info->jack_server_arg)
- {
- free (args_info->jack_server_arg); /* free previous argument */
- args_info->jack_server_arg = 0;
- }
- if (args_info->jack_server_orig)
- {
- free (args_info->jack_server_orig); /* free previous argument */
- args_info->jack_server_orig = 0;
- }
for (i = 0; i < args_info->inputs_num; ++i)
free (args_info->inputs [i]);
@@ -171,13 +162,6 @@ cmdline_parser_file_save(const char *filename, struct gengetopt_args_info *args_
fprintf(outfile, "%s\n", "port");
}
}
- if (args_info->jack_server_given) {
- if (args_info->jack_server_orig) {
- fprintf(outfile, "%s=\"%s\"\n", "jack-server", args_info->jack_server_orig);
- } else {
- fprintf(outfile, "%s\n", "jack-server");
- }
- }
if (args_info->in_jackd_given) {
fprintf(outfile, "%s\n", "in-jackd");
}
@@ -266,13 +250,12 @@ cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_inf
{ "help", 0, NULL, 'h' },
{ "version", 0, NULL, 'V' },
{ "port", 1, NULL, 'p' },
- { "jack-server", 1, NULL, 'j' },
{ "in-jackd", 0, NULL, 'i' },
{ NULL, 0, NULL, 0 }
};
stop_char = 0;
- c = getopt_long (argc, argv, "hVp:j:i", long_options, &option_index);
+ c = getopt_long (argc, argv, "hVp:i", long_options, &option_index);
if (c == -1) break; /* Exit from `while (1)' loop. */
@@ -306,24 +289,6 @@ cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_inf
args_info->port_orig = gengetopt_strdup (optarg);
break;
- case 'j': /* Name of Jack server to attach to. */
- if (local_args_info.jack_server_given)
- {
- fprintf (stderr, "%s: `--jack-server' (`-j') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
- goto failure;
- }
- if (args_info->jack_server_given && ! override)
- continue;
- local_args_info.jack_server_given = 1;
- args_info->jack_server_given = 1;
- if (args_info->jack_server_arg)
- free (args_info->jack_server_arg); /* free previous string */
- args_info->jack_server_arg = gengetopt_strdup (optarg);
- if (args_info->jack_server_orig)
- free (args_info->jack_server_orig); /* free previous string */
- args_info->jack_server_orig = gengetopt_strdup (optarg);
- break;
-
case 'i': /* Run engine as in-process JACK client. */
if (local_args_info.in_jackd_given)
{