Changeset 61043ed for examples/utils.c

Timestamp:

Dec 11, 2009, 4:36:43 PM (15 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:

40a05d3

Parents:

2c50da9

Message:

utils.c: woodblock vector is overlap_size long

File:

• examples/utils.c (modified) (2 diffs)

examples/utils.c

@@ -208 +208 @@
   parse_args (argc, argv);
 
-  woodblock = new_fvec (buffer_size, 1);
+  if (!usejack) {
+    debug ("Opening files ...\n");
+    file = new_aubio_sndfile_ro (input_filename);
+    if (file == NULL) {
+      outmsg ("Could not open input file %s.\n", input_filename);
+      exit (1);
+    }
+    if (verbose)
+      aubio_sndfile_info (file);
+    channels = aubio_sndfile_channels (file);
+    samplerate = aubio_sndfile_samplerate (file);
+    if (output_filename != NULL)
+      fileout = new_aubio_sndfile_wo (file, output_filename);
+  }
+#ifdef HAVE_LASH
+  else {
+    aubio_lash_client = lash_init (lash_args, argv[0],
+        LASH_Config_Data_Set | LASH_Terminal, LASH_PROTOCOL (2, 0));
+    if (!aubio_lash_client) {
+      fprintf (stderr, "%s: could not initialise lash\n", __FUNCTION__);
+    }
+    /* tell the lash server our client id */
+    if (lash_enabled (aubio_lash_client)) {
+      lash_event_t *event =
+          (lash_event_t *) lash_event_new_with_type (LASH_Client_Name);
+      lash_event_set_string (event, "aubio");
+      lash_send_event (aubio_lash_client, event);
+      pthread_create (&lash_thread, NULL, lash_thread_main, NULL);
+    }
+  }
+#endif /* HAVE_LASH */
+
+  woodblock = new_fvec (overlap_size, channels);
   if (output_filename || usejack) {
     /* dummy assignement to keep egcs happy */
@@ -223 +255 @@
     aubio_sndfile_read (onsetfile, overlap_size, woodblock);
   }
-
-  if (!usejack) {
-    debug ("Opening files ...\n");
-    file = new_aubio_sndfile_ro (input_filename);
-    if (file == NULL) {
-      outmsg ("Could not open input file %s.\n", input_filename);
-      exit (1);
-    }
-    if (verbose)
-      aubio_sndfile_info (file);
-    channels = aubio_sndfile_channels (file);
-    samplerate = aubio_sndfile_samplerate (file);
-    if (output_filename != NULL)
-      fileout = new_aubio_sndfile_wo (file, output_filename);
-  }
-#ifdef HAVE_LASH
-  else {
-    aubio_lash_client = lash_init (lash_args, argv[0],
-        LASH_Config_Data_Set | LASH_Terminal, LASH_PROTOCOL (2, 0));
-    if (!aubio_lash_client) {
-      fprintf (stderr, "%s: could not initialise lash\n", __FUNCTION__);
-    }
-    /* tell the lash server our client id */
-    if (lash_enabled (aubio_lash_client)) {
-      lash_event_t *event =
-          (lash_event_t *) lash_event_new_with_type (LASH_Client_Name);
-      lash_event_set_string (event, "aubio");
-      lash_send_event (aubio_lash_client, event);
-      pthread_create (&lash_thread, NULL, lash_thread_main, NULL);
-    }
-  }
-#endif /* HAVE_LASH */
 
   ibuf = new_fvec (overlap_size, channels);