ref: ee0cc27ba4e161979fb17eda9768daaf0ec19ae6
parent: 2a33cc9b096190a5e5d28343ba4054a084d54d0f
author: Paul Brossier <piem@altern.org>
date: Mon May 23 09:38:02 EDT 2005
added -s option in examples/utils.c added -s option in examples/utils.c
--- a/examples/utils.c
+++ b/examples/utils.c
@@ -85,112 +85,116 @@
void usage (FILE * stream, int exit_code)
{- fprintf(stream, "usage: %s [ options ] \n", prog_name);
- fprintf(stream,
- " -j --jack Use Jack.\n"
- " -o --output Output type.\n"
- " -i --input Input type.\n"
- " -h --help Display this message.\n"
- " -v --verbose Print verbose message.\n"
- );
- exit(exit_code);
+ fprintf(stream, "usage: %s [ options ] \n", prog_name);
+ fprintf(stream,
+ " -j --jack Use Jack.\n"
+ " -o --output Output type.\n"
+ " -i --input Input type.\n"
+ " -h --help Display this message.\n"
+ " -v --verbose Print verbose message.\n"
+ );
+ exit(exit_code);
}
int parse_args (int argc, char **argv) {- const char *options = "hvjo:i:O:t:a";
- int next_option;
- struct option long_options[] =
- {- {"help", 0, NULL, 'h'},- {"verbose", 0, NULL, 'v'},- {"jack", 0, NULL, 'j'},- {"output", 0, NULL, 'o'},- {"input", 0, NULL, 'i'},- {"onset", 0, NULL, 'O'},- {"threshold", 0, NULL, 't'},- {"averaging", 0, NULL, 'a'},- {NULL, 0, NULL, 0}- };
- prog_name = argv[0];
- if( argc < 1 ) {- usage (stderr, 1);
- return -1;
- }
- do {- next_option = getopt_long (argc, argv, options,
- long_options, NULL);
- switch (next_option) {- case 'o':
- output_filename = optarg;
- break;
- case 'i':
- input_filename = optarg;
- break;
- case 'h': /* help */
- usage (stdout, 0);
- return -1;
- case 'v': /* verbose */
- verbose = 1;
- break;
- case 'j': /* verbose */
- usejack = 1;
- break;
- case 'O': /*onset type*/
- if (strcmp(optarg,"energy") == 0)
- type_onset = energy;
- else if (strcmp(optarg,"specdiff") == 0)
- type_onset = specdiff;
- else if (strcmp(optarg,"hfc") == 0)
- type_onset = hfc;
- else if (strcmp(optarg,"complexdomain") == 0)
- type_onset = complexdomain;
- else if (strcmp(optarg,"phase") == 0)
- type_onset = phase;
- else {- debug("could not get onset type.\n");- abort();
+ const char *options = "hvjo:i:O:t:s:a";
+ int next_option;
+ struct option long_options[] =
+ {+ {"help" , 0, NULL, 'h'},+ {"verbose" , 0, NULL, 'v'},+ {"jack" , 0, NULL, 'j'},+ {"output" , 0, NULL, 'o'},+ {"input" , 0, NULL, 'i'},+ {"onset" , 0, NULL, 'O'},+ {"threshold", 0, NULL, 't'},+ {"silence" , 0, NULL, 's'},+ {"averaging", 0, NULL, 'a'},+ {NULL , 0, NULL, 0}+ };
+ prog_name = argv[0];
+ if( argc < 1 ) {+ usage (stderr, 1);
+ return -1;
}
- usedoubled = 0;
- break;
- case 't': /* threshold value for onset */
- threshold = (smpl_t)atof(optarg);
- /*
- if (!isfinite(threshold)) {- debug("could not get threshold.\n");- abort();
+ do {+ next_option = getopt_long (argc, argv, options,
+ long_options, NULL);
+ switch (next_option) {+ case 'o':
+ output_filename = optarg;
+ break;
+ case 'i':
+ input_filename = optarg;
+ break;
+ case 'h': /* help */
+ usage (stdout, 0);
+ return -1;
+ case 'v': /* verbose */
+ verbose = 1;
+ break;
+ case 'j': /* verbose */
+ usejack = 1;
+ break;
+ case 'O': /*onset type*/
+ if (strcmp(optarg,"energy") == 0)
+ type_onset = energy;
+ else if (strcmp(optarg,"specdiff") == 0)
+ type_onset = specdiff;
+ else if (strcmp(optarg,"hfc") == 0)
+ type_onset = hfc;
+ else if (strcmp(optarg,"complexdomain") == 0)
+ type_onset = complexdomain;
+ else if (strcmp(optarg,"phase") == 0)
+ type_onset = phase;
+ else {+ debug("could not get onset type.\n");+ abort();
+ }
+ usedoubled = 0;
+ break;
+ case 's': /* threshold value for onset */
+ threshold2 = (smpl_t)atof(optarg);
+ break;
+ case 't': /* threshold value for onset */
+ threshold = (smpl_t)atof(optarg);
+ /*
+ if (!isfinite(threshold)) {+ debug("could not get threshold.\n");+ abort();
+ }
+ */
+ break;
+ case 'a':
+ averaging = 1;
+ break;
+ case '?': /* unknown options */
+ usage(stderr, 1);
+ break;
+ case -1: /* done with options */
+ break;
+ default: /*something else unexpected */
+ abort ();
+ }
}
- */
- break;
- case 'a':
- averaging = 1;
- break;
- case '?': /* unknown options */
- usage(stderr, 1);
- break;
- case -1: /* done with options */
- break;
- default: /*something else unexpected */
- abort ();
- }
- }
- while (next_option != -1);
+ while (next_option != -1);
- if (input_filename != NULL) {- debug ("Input file : %s\n", input_filename );- } else if (input_filename != NULL && output_filename != NULL) {- debug ("Input file : %s\n", input_filename );- debug ("Output file : %s\n", output_filename );- } else {- if (JACK_SUPPORT)
- {- debug ("Jack input output\n");- usejack = 1;
- } else {- debug ("Error: Could not switch to jack mode\n aubio was compiled without jack support\n");- exit(1);
- }
- }
- return 0;
+ if (input_filename != NULL) {+ debug ("Input file : %s\n", input_filename );+ } else if (input_filename != NULL && output_filename != NULL) {+ debug ("Input file : %s\n", input_filename );+ debug ("Output file : %s\n", output_filename );+ } else {+ if (JACK_SUPPORT)
+ {+ debug ("Jack input output\n");+ usejack = 1;
+ } else {+ debug ("Error: Could not switch to jack mode\n aubio was compiled without jack support\n");+ exit(1);
+ }
+ }
+ return 0;
}
void examples_common_init(int argc,char ** argv) {