Changeset df7be43 for examples

Timestamp:

Aug 12, 2015, 4:31:40 PM (9 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3ff50e5

Parents:

340cb93

Message:

examples/parse_args.h: only parse time format string once, warn if unknown

Location:

examples

Files:

• aubioonset.c (modified) (1 diff)
• parse_args.h (modified) (2 diffs)
• utils.c (modified) (2 diffs)

examples/aubioonset.c

@@ -50 +50 @@
 {
   if ( is_onset ) {
-    if (strcmp (time_format, "samples") == 0) {
-      outmsg ("%d\n", aubio_onset_get_last (o) );
-    } else if (strcmp (time_format, "ms") == 0) {
-      outmsg ("%f\n", aubio_onset_get_last_ms (o) );
-    } else {
-      outmsg ("%f\n", aubio_onset_get_last_s (o) );
-    }
+    print_time(aubio_onset_get_last (o));
+    outmsg ("\n");
   }
 }

examples/parse_args.h

@@ -36 +36 @@
 extern smpl_t pitch_tolerance;
 // time stuff
-extern char_t * time_format;
+extern uint_t time_format;
 // tempo stuff
 extern char_t * tempo_method;
@@ -209 +209 @@
         break;
       case 'T':
-        time_format = optarg;
+        if (strcmp (optarg, "samples") == 0) {
+          time_format = 2;
+        } else if (strcmp (optarg, "ms") == 0) {
+          time_format = 1;
+        } else if (strcmp (optarg, "seconds") == 0) {
+          time_format = 0;
+        } else {
+          errmsg ("Warning: did not get '%s' time-format string\n", optarg);
+        }
         break;
       case 's':                /* silence threshold */

examples/utils.c

@@ -49 +49 @@
 smpl_t pitch_tolerance = 0.0; // will be set if != 0.
 // time stuff
-char_t * time_format = "seconds";
+uint_t time_format = 0; // for "seconds", 1 for "ms", 2 for "samples"
 // tempo stuff
 char_t * tempo_method = "default";
@@ -210 +210 @@
 void print_time (uint_t time_in_samples) {
   /* output times in selected format */
-  if (strcmp (time_format, "samples") == 0) {
+  if (time_format == 2) {
     outmsg ("%d", time_in_samples);
-  } else if (strcmp (time_format, "ms") == 0) {
+  } else if (time_format == 1) {
     outmsg ("%f", 1000. * time_in_samples / (float) samplerate);
   } else {