started enabling ladcca support

 ladcca still need works, not sure how to avoid the extern client

diff --git a/TODO b/TODO
index 71ac5cb..bbe249f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,10 @@
 TODO
 
+- test zero crossing in python/aubiocut
+- complete manpages
 - drop the multichannel bits ?
 - drop the midi/jack bits ? 
-- looks like it really needs ring buffers
-- move mathutils and sample to use gsl or some faster library
+- move mathutils and sample to use gsl or some faster library ?
 - code cleanup and optimisation
+- really enable ladcca support
 - mix with libsoundtouch and make a melodyne gui

diff --git a/examples/Makefile.am b/examples/Makefile.am
index e4ff18a..e0f4fdb 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,8 +2,8 @@
 #SUBDIRS=onsets
 
 # global flags
-AM_CFLAGS = -I../src
-AM_LDFLAGS = -L../src -laubio
+AM_CFLAGS = -I../src @LADCCA_CFLAGS@
+AM_LDFLAGS = -L../src @LADCCA_LIBS@ -laubio
 #AM_SOURCES = utils.c
 
 # add your programs to this list

diff --git a/examples/Makefile.in b/examples/Makefile.in
index a7b7f52..d22a97f 100644 (file)
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -155,8 +155,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # global flags
-AM_CFLAGS = -I../src
-AM_LDFLAGS = -L../src -laubio
+AM_CFLAGS = -I../src @LADCCA_CFLAGS@
+AM_LDFLAGS = -L../src @LADCCA_LIBS@ -laubio
 #AM_SOURCES = utils.c
 
 # add your programs to this list

diff --git a/examples/midialsa.c b/examples/midialsa.c
index cad854e..d4974d7 100644 (file)
--- a/examples/midialsa.c
+++ b/examples/midialsa.c
@@ -3,6 +3,12 @@
 #include "aubio.h"
 #include <unistd.h>
 
+/* not supported yet */
+#ifdef LADCCA_SUPPORT
+#include <ladcca/ladcca.h>
+cca_client_t * aubio_cca_client;
+#endif /* LADCCA_SUPPORT */
+
 int main(int argc, char **argv) {
 #if ALSA_SUPPORT
   aubio_midi_player_t * mplay = new_aubio_midi_player();

diff --git a/examples/midiparse.c b/examples/midiparse.c
index b09ec82..abe93f0 100644 (file)
--- a/examples/midiparse.c
+++ b/examples/midiparse.c
@@ -20,6 +20,12 @@
 #include "aubio.h"
 #include <unistd.h>
 
+/* not supported yet */
+#ifdef LADCCA_SUPPORT
+#include <ladcca/ladcca.h>
+cca_client_t * aubio_cca_client;
+#endif /* LADCCA_SUPPORT */
+
 int main(int argc, char ** argv) {
 #if ALSA_SUPPORT
        aubio_midi_player_t * mplay = new_aubio_midi_player();

diff --git a/examples/midiplay.c b/examples/midiplay.c
index f164b03..421964f 100644 (file)
--- a/examples/midiplay.c
+++ b/examples/midiplay.c
@@ -25,6 +25,12 @@
 #include "aubio.h"
 #include <unistd.h>
 
+/* not supported yet */
+#ifdef LADCCA_SUPPORT
+#include <ladcca/ladcca.h>
+cca_client_t * aubio_cca_client;
+#endif /* LADCCA_SUPPORT */
+
 int main(int argc, char ** argv) {
 #if ALSA_SUPPORT
   aubio_midi_player_t * mplay = new_aubio_midi_player();

diff --git a/examples/utils.c b/examples/utils.c
index dd21312..81ded93 100644 (file)
--- a/examples/utils.c
+++ b/examples/utils.c
@@ -12,6 +12,7 @@
 #include <math.h> /* for isfinite */
 #include "utils.h"
 
+/* not supported yet */
 #ifdef LADCCA_SUPPORT
 #include <ladcca/ladcca.h>
 cca_client_t * aubio_cca_client;

diff --git a/src/aubio_priv.h b/src/aubio_priv.h
index 64c496f..98877d0 100644 (file)
--- a/src/aubio_priv.h
+++ b/src/aubio_priv.h
@@ -65,6 +65,13 @@
 #include <string.h>
 #endif
 
+#ifdef ALSA_SUPPORT
+#ifdef LADCCA_SUPPORT
+#include <ladcca/ladcca.h>
+extern cca_client_t * aubio_cca_client;
+#endif /* LADCCA_SUPPORT */
+#endif /* ALSA_SUPPORT */
+
 
 #include "types.h"
 

diff --git a/src/midi_alsa_raw.c b/src/midi_alsa_raw.c
index 2b99c5f..1556d01 100644 (file)
--- a/src/midi_alsa_raw.c
+++ b/src/midi_alsa_raw.c
@@ -30,7 +30,6 @@
 #include "midi_parser.h"
 #include "midi_driver.h"
 
-
 #if ALSA_SUPPORT
 
 #define ALSA_PCM_NEW_HW_PARAMS_API
@@ -43,12 +42,6 @@
 
 #include "config.h"
 
-#ifdef LADCCA_SUPPORT
-#include <ladcca/ladcca.h>
-extern cca_client_t * aubio_cca_client;
-#endif /* LADCCA_SUPPORT */
-
-
 #define AUBIO_ALSA_DEFAULT_MIDI_DEVICE  "default"
 
 /** \bug double define? */

diff --git a/src/midi_alsa_seq.c b/src/midi_alsa_seq.c
index 8d41a79..cf556eb 100644 (file)
--- a/src/midi_alsa_seq.c
+++ b/src/midi_alsa_seq.c
@@ -41,12 +41,6 @@
 #include <sys/poll.h>
 /* #include <errno.h> //perror is in stdio.h */
 
-
-#ifdef LADCCA_SUPPORT
-#include <ladcca/ladcca.h>
-extern cca_client_t * aubio_cca_client;
-#endif /* LADCCA_SUPPORT */
-
 #define AUBIO_ALSA_DEFAULT_SEQ_DEVICE   "default"
 
 #define AUBIO_ALSA_BUFFER_LENGTH 512