Changeset 205da86 for src


Ignore:
Timestamp:
Dec 6, 2004, 8:05:28 PM (20 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

Location:
src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rb60dd4ae r205da86  
    44        config.h \
    55        types.h \
    6         jackio.h \
    76        phasevoc.h \
    8         sndfileio.h \
    97        mathutils.h \
    108        fft.h \
    … …  
    2523libaubio_la_SOURCES = aubio.h \
    2624        types.h \
    27         jackio.c \
    28         jackio.h \
    2925        phasevoc.c \
    3026        phasevoc.h \
    31         sndfileio.c \
    32         sndfileio.h \
    3327        mathutils.c \
    3428        mathutils.h \
    … …  
    6054        filter.h
    6155
    62 AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @LADCCA_CFLAGS@
    63 libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
     56AM_CFLAGS = @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
     57libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@

  • src/Makefile.in

    rb60dd4ae r205da86  
    157157        config.h \
    158158        types.h \
    159         jackio.h \
    160159        phasevoc.h \
    161         sndfileio.h \
    162160        mathutils.h \
    163161        fft.h \
    … …  
    179177libaubio_la_SOURCES = aubio.h \
    180178        types.h \
    181         jackio.c \
    182         jackio.h \
    183179        phasevoc.c \
    184180        phasevoc.h \
    185         sndfileio.c \
    186         sndfileio.h \
    187181        mathutils.c \
    188182        mathutils.h \
    … …  
    215209
    216210
    217 AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @LADCCA_CFLAGS@
    218 libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
     211AM_CFLAGS = @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
     212libaubio_la_LIBADD = @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
    219213subdir = src
    220214ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    226220libaubio_la_LDFLAGS =
    227221libaubio_la_DEPENDENCIES = @LTLIBOBJS@
    228 am_libaubio_la_OBJECTS = jackio.lo phasevoc.lo sndfileio.lo mathutils.lo \
    229         fft.lo sample.lo hist.lo scale.lo resample.lo onsetdetection.lo \
    230         tss.lo peakpick.lo biquad.lo pitchdetection.lo pitchmcomb.lo \
     222am_libaubio_la_OBJECTS = phasevoc.lo mathutils.lo fft.lo sample.lo \
     223        hist.lo scale.lo resample.lo onsetdetection.lo tss.lo \
     224        peakpick.lo biquad.lo pitchdetection.lo pitchmcomb.lo \
    231225        pitchyin.lo filter.lo
    232226libaubio_la_OBJECTS = $(am_libaubio_la_OBJECTS)
    … …  
    237231@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/biquad.Plo ./$(DEPDIR)/fft.Plo \
    238232@AMDEP_TRUE@    ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/hist.Plo \
    239 @AMDEP_TRUE@    ./$(DEPDIR)/jackio.Plo ./$(DEPDIR)/mathutils.Plo \
     233@AMDEP_TRUE@    ./$(DEPDIR)/mathutils.Plo \
    240234@AMDEP_TRUE@    ./$(DEPDIR)/onsetdetection.Plo \
    241235@AMDEP_TRUE@    ./$(DEPDIR)/peakpick.Plo ./$(DEPDIR)/phasevoc.Plo \
    … …  
    243237@AMDEP_TRUE@    ./$(DEPDIR)/pitchmcomb.Plo ./$(DEPDIR)/pitchyin.Plo \
    244238@AMDEP_TRUE@    ./$(DEPDIR)/resample.Plo ./$(DEPDIR)/sample.Plo \
    245 @AMDEP_TRUE@    ./$(DEPDIR)/scale.Plo ./$(DEPDIR)/sndfileio.Plo \
    246 @AMDEP_TRUE@    ./$(DEPDIR)/tss.Plo
     239@AMDEP_TRUE@    ./$(DEPDIR)/scale.Plo ./$(DEPDIR)/tss.Plo
    247240COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    248241        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    327320@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filter.Plo@am__quote@
    328321@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@
    329 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jackio.Plo@am__quote@
    330322@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathutils.Plo@am__quote@
    331323@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onsetdetection.Plo@am__quote@
    … …  
    338330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample.Plo@am__quote@
    339331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Plo@am__quote@
    340 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfileio.Plo@am__quote@
    341332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tss.Plo@am__quote@
    342333

  • src/aubio.h

    rb60dd4ae r205da86  
    6868#include "resample.h"
    6969
    70 #ifdef JACK_SUPPORT
    71 #include "jackio.h"
    72 #endif
    73 
    74 #include "sndfileio.h"
    7570#include "peakpick.h"
    7671#include "biquad.h"
Note: See TracChangeset for help on using the changeset viewer.