Changeset b511fa9 for examples

Timestamp:

Sep 23, 2009, 7:40:14 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:

000b090

Parents:

2062e48

Message:

replace FOO_SUPPORT with HAVE_FOO, use float for jack_process function prototype

Location:

examples

Files:

• utils.c (modified) (11 diffs)
• utils.h (modified) (1 diff)

examples/utils.c

@@ -2 +2 @@
 #include "aubio.h"
 
-#ifndef JACK_SUPPORT
-#define JACK_SUPPORT 0
+#ifndef HAVE_JACK
+#define HAVE_JACK 0
 #endif
 
@@ -13 +13 @@
 #include "utils.h"
 
-#ifdef LASH_SUPPORT
+#ifdef HAVE_LASH
 #include <lash/lash.h>
 #include <pthread.h>
@@ -23 +23 @@
 void restore_data(lash_config_t * lash_config);
 pthread_t lash_thread;
-#endif /* LASH_SUPPORT */
+#endif /* HAVE_LASH */
 
 /* settings */
@@ -131 +131 @@
                 {NULL       , 0, NULL, 0}
         };
-#ifdef LASH_SUPPORT
+#ifdef HAVE_LASH
         lash_args = lash_extract_args(&argc, &argv);
-#endif /* LASH_SUPPORT */
+#endif /* HAVE_LASH */
         prog_name = argv[0];
         if( argc < 1 ) {
@@ -238 +238 @@
                 debug ("Output file : %s\n", output_filename );
         } else {
-                if (JACK_SUPPORT)
+                if (HAVE_JACK)
                 {
                         debug ("Jack input output\n");
@@ -288 +288 @@
       fileout = new_aubio_sndfile_wo(file, output_filename);
   }
-#ifdef LASH_SUPPORT
+#ifdef HAVE_LASH
   else {
     aubio_lash_client = lash_init(lash_args, argv[0],
@@ -304 +304 @@
     }
   }
-#endif /* LASH_SUPPORT */
+#endif /* HAVE_LASH */
 
   ibuf      = new_fvec(overlap_size, channels);
@@ -360 +360 @@
 void examples_common_process(aubio_process_func_t process_func, aubio_print_func_t print ){
   if(usejack) {
-#if JACK_SUPPORT
+#if HAVE_JACK
     aubio_jack_t * jack_setup;
     debug("Jack init ...\n");
@@ -432 +432 @@
     smpl_t mpitch = floor(aubio_freqtomidi(pitch)+.5);
     /* we should check if we use midi here, not jack */
-#if ALSA_SUPPORT
+#if HAVE_ALSA
     if (usejack) {
         if (velo==0) {
@@ -474 +474 @@
 }
 
-#if LASH_SUPPORT
+#if HAVE_LASH
 
 void * lash_thread_main(void *data __attribute__((unused)))
@@ -543 +543 @@
 }
 
-#endif /* LASH_SUPPORT */
-
+#endif /* HAVE_LASH */
+

examples/utils.h

@@ -52 +52 @@
 void examples_common_del(void);
 typedef void (aubio_print_func_t)(void);
-#ifndef JACK_SUPPORT
+#ifndef HAVE_JACK
 typedef int (*aubio_process_func_t)
-        (smpl_t **input, smpl_t **output, int nframes);
+        (float **input, float **output, int nframes);
 #endif
 void examples_common_process(aubio_process_func_t process_func, aubio_print_func_t print);