Changeset 205da86

Timestamp:

Dec 6, 2004, 8:05:28 PM (19 years ago)

Author:

Paul Brossier <piem@altern.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:

77494e7

Parents:

b60dd4ae

Message:

moved jack and sndfile to aubioext

Files:

• examples/aubioonset.c (modified) (1 diff)
• ext/Makefile.am (added)
• ext/Makefile.in (added)
• ext/jackio.c (moved) (moved from src/jackio.c)
• ext/jackio.h (moved) (moved from src/jackio.h)
• ext/sndfileio.c (moved) (moved from src/sndfileio.c)
• ext/sndfileio.h (moved) (moved from src/sndfileio.h)
• src/Makefile.am (modified) (3 diffs)
• src/Makefile.in (modified) (8 diffs)
• src/aubio.h (modified) (1 diff)
• swig/Makefile.am (modified) (1 diff)
• swig/Makefile.in (modified) (1 diff)
• swig/aubio.i (modified) (1 diff)

examples/aubioonset.c

@@ -23 +23 @@
 #include <unistd.h>
 #include "aubio.h"
+#include "aubioext.h"
 #include "utils.h"
 

src/Makefile.am

@@ -4 +4 @@
         config.h \
         types.h \
-        jackio.h \
         phasevoc.h \
-        sndfileio.h \
         mathutils.h \
         fft.h \
@@ -25 +23 @@
 libaubio_la_SOURCES = aubio.h \
         types.h \
-        jackio.c \
-        jackio.h \
         phasevoc.c \
         phasevoc.h \
-        sndfileio.c \
-        sndfileio.h \
         mathutils.c \
         mathutils.h \
@@ -60 +54 @@
         filter.h
 
-AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @LADCCA_CFLAGS@
-libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
+AM_CFLAGS = @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
+libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@

src/Makefile.in

@@ -157 +157 @@
         config.h \
         types.h \
-        jackio.h \
         phasevoc.h \
-        sndfileio.h \
         mathutils.h \
         fft.h \
@@ -179 +177 @@
 libaubio_la_SOURCES = aubio.h \
         types.h \
-        jackio.c \
-        jackio.h \
         phasevoc.c \
         phasevoc.h \
-        sndfileio.c \
-        sndfileio.h \
         mathutils.c \
         mathutils.h \
@@ -215 +209 @@
 
 
-AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @LADCCA_CFLAGS@
-libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
+AM_CFLAGS = @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
+libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
 subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -226 +220 @@
 libaubio_la_LDFLAGS =
 libaubio_la_DEPENDENCIES = @LTLIBOBJS@
-am_libaubio_la_OBJECTS = jackio.lo phasevoc.lo sndfileio.lo mathutils.lo \
-        fft.lo sample.lo hist.lo scale.lo resample.lo onsetdetection.lo \
-        tss.lo peakpick.lo biquad.lo pitchdetection.lo pitchmcomb.lo \
+am_libaubio_la_OBJECTS = phasevoc.lo mathutils.lo fft.lo sample.lo \
+        hist.lo scale.lo resample.lo onsetdetection.lo tss.lo \
+        peakpick.lo biquad.lo pitchdetection.lo pitchmcomb.lo \
         pitchyin.lo filter.lo
 libaubio_la_OBJECTS = $(am_libaubio_la_OBJECTS)
@@ -237 +231 @@
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/biquad.Plo ./$(DEPDIR)/fft.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/hist.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/jackio.Plo ./$(DEPDIR)/mathutils.Plo \
+@AMDEP_TRUE@    ./$(DEPDIR)/mathutils.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/onsetdetection.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/peakpick.Plo ./$(DEPDIR)/phasevoc.Plo \
@@ -243 +237 @@
 @AMDEP_TRUE@    ./$(DEPDIR)/pitchmcomb.Plo ./$(DEPDIR)/pitchyin.Plo \
 @AMDEP_TRUE@    ./$(DEPDIR)/resample.Plo ./$(DEPDIR)/sample.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/scale.Plo ./$(DEPDIR)/sndfileio.Plo \
-@AMDEP_TRUE@    ./$(DEPDIR)/tss.Plo
+@AMDEP_TRUE@    ./$(DEPDIR)/scale.Plo ./$(DEPDIR)/tss.Plo
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
         $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -327 +320 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jackio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathutils.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onsetdetection.Plo@am__quote@
@@ -338 +330 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfileio.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tss.Plo@am__quote@
 

src/aubio.h

@@ -68 +68 @@
 #include "resample.h"
 
-#ifdef JACK_SUPPORT
-#include "jackio.h"
-#endif 
-
-#include "sndfileio.h"
 #include "peakpick.h"
 #include "biquad.h"

swig/Makefile.am

@@ -7 +7 @@
 SW_CFLAGS = -DJACK_SUPPORT -shared -Werror -Wno-char-subscripts -Wno-unknown-pragmas
 #SW_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations
-SWINCLUDE = -I/usr/include/python2.3 -I../src -I/usr/include
-SWLDFLAGS = -L../src/.libs -laubio
-
+SWINCLUDE = -I/usr/include/python2.3 -I../src -I../ext -I/usr/include
+SWLDFLAGS = -L../ext/.libs -laubioext -L../src/.libs -laubio
 
 all:

swig/Makefile.in

@@ -160 +160 @@
 SW_CFLAGS = -DJACK_SUPPORT -shared -Werror -Wno-char-subscripts -Wno-unknown-pragmas
 #SW_CFLAGS = -Wno-missing-prototypes -Wno-missing-declarations
-SWINCLUDE = -I/usr/include/python2.3 -I../src -I/usr/include
-SWLDFLAGS = -L../src/.libs -laubio
+SWINCLUDE = -I/usr/include/python2.3 -I../src -I../ext -I/usr/include
+SWLDFLAGS = -L../ext/.libs -laubioext -L../src/.libs -laubio
 subdir = swig
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

swig/aubio.i

@@ -3 +3 @@
 %{
         #include "aubio.h"
+        #include "aubioext.h"
 %}
 
 #include "aubio.h"
-#include "config.h"
+#include "aubioext.h"
 
 /* type aliases */