Changeset b511fa9 for ext

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:

ext

Files:

• aubioext.h (modified) (1 diff)
• jackio.c (modified) (2 diffs)
• jackio.h (modified) (1 diff)
• midi/midi_driver.h (modified) (1 diff)

ext/aubioext.h

@@ -28 +28 @@
 #include <aubio.h>
  
-#ifdef JACK_SUPPORT
+#ifdef HAVE_JACK
 #include "jackio.h"
 #endif 
+
+#if HAVE_ALSA
+#define ALSA_SUPPORT 1
+#endif
 
 #include "sndfileio.h"

ext/jackio.c

@@ -19 +19 @@
 
 #include "config.h"
-#ifdef JACK_SUPPORT
+#ifdef HAVE_JACK
 #include <jack/jack.h>
 #include "aubio_priv.h"
@@ -173 +173 @@
 
 
-#endif /* JACK_SUPPORT */
+#endif /* HAVE_JACK */

ext/jackio.h

@@ -35 +35 @@
 typedef struct _aubio_jack_t aubio_jack_t;
 /** jack process function */
-typedef int (*aubio_process_func_t)(smpl_t **input, smpl_t **output, int
+typedef int (*aubio_process_func_t)(float **input, float **output, int
     nframes);
 

ext/midi/midi_driver.h

@@ -50 +50 @@
 void aubio_midi_driver_settings(aubio_settings_t* settings);
 
-#include "config.h"
-#if JACK_SUPPORT
+#include "aubioext.h"
+#if HAVE_JACK 
 void aubio_midi_direct_output(aubio_midi_driver_t * dev, aubio_midi_event_t * event); 
-#endif
+#endif /* HAVE_JACK */
 
 #endif  /* _AUBIO_AUDRIVER_H */