Changeset 32d6958


Ignore:
Timestamp:
Nov 24, 2007, 10:00:20 PM (17 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:
ed631e9
Parents:
bcf38fe
Message:

src/: more moving and splitting

Location:
src
Files:
10 edited
20 moved

Legend:

Unmodified
Added
Removed

  • src/Makefile.am

    rbcf38fe r32d6958  
    22pkginclude_HEADERS = aubio.h \
    33        types.h \
    4         phasevoc.h \
    5         mathutils.h \
    6         fft.h \
    7         sample.h \
    84        fvec.h \
    95        cvec.h \
    10         hist.h \
    11         scale.h \
    12         resample.h \
    13         tss.h \
    14         biquad.h \
     6        mathutils.h \
     7        utils/hist.h \
     8        utils/scale.h \
     9        temporal/resample.h \
     10        temporal/biquad.h \
     11        temporal/filter.h \
     12        spectral/filterbank.h \
     13        spectral/mfcc.c \
     14        spectral/phasevoc.h \
     15        spectral/fft.h \
     16        spectral/tss.h \
    1517        pitch/pitchdetection.h \
    1618        pitch/pitchmcomb.h \
    … …  
    2325        onset/peakpick.h \
    2426        tempo/tempo.h \
    25         tempo/beattracking.h \
    26         filter.h \
    27         filterbank.h \
    28         mfcc.h
     27        tempo/beattracking.h
    2928
    3029nodist_pkginclude_HEADERS = config.h
    … …  
    3332libaubio_la_SOURCES = aubio.h \
    3433        types.h \
    35         phasevoc.c \
    36         phasevoc.h \
    37         mathutils.c \
    38         mathutils.h \
    39         fft.c \
    40         fft.h \
    4134        fvec.c \
    4235        fvec.h \
    4336        cvec.c \
    4437        cvec.h \
    45         hist.c \
    46         hist.h \
    47         scale.c \
    48         scale.h \
    49         resample.c \
    50         resample.h \
    51         tss.c \
    52         tss.h \
    53         biquad.c \
    54         biquad.h \
     38        mathutils.c \
     39        mathutils.h \
     40        utils/hist.c \
     41        utils/hist.h \
     42        utils/scale.c \
     43        utils/scale.h \
     44        temporal/resample.c \
     45        temporal/resample.h \
     46        temporal/biquad.c \
     47        temporal/biquad.h \
     48        temporal/filter.c \
     49        temporal/filter.h \
     50        spectral/filterbank.c \
     51        spectral/filterbank.h \
     52        spectral/mfcc.h \
     53        spectral/mfcc.c \
     54        spectral/phasevoc.c \
     55        spectral/phasevoc.h \
     56        spectral/fft.c \
     57        spectral/fft.h \
     58        spectral/tss.c \
     59        spectral/tss.h \
    5560        pitch/pitchdetection.c \
    5661        pitch/pitchdetection.h \
    … …  
    7479        tempo/tempo.h \
    7580        tempo/beattracking.c \
    76         tempo/beattracking.h \
    77         filter.c \
    78         filter.h \
    79         filterbank.c \
    80         filterbank.h \
    81         mfcc.h \
    82         mfcc.c
     81        tempo/beattracking.h
    8382
    8483AM_CFLAGS = @AUBIO_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@

  • src/aubio.h

    rbcf38fe r32d6958  
    6060#include "types.h"
    6161#include "sample.h"
    62 #include "fft.h"
    63 #include "phasevoc.h"
     62#include "spectral/fft.h"
     63#include "spectral/phasevoc.h"
    6464#include "mathutils.h"
    65 #include "scale.h"
    66 #include "hist.h"
    67 #include "tss.h"
    68 #include "resample.h"
    69 #include "biquad.h"
    70 #include "filter.h"
     65#include "utils/scale.h"
     66#include "utils/hist.h"
     67#include "spectral/tss.h"
     68#include "temporal/resample.h"
     69#include "temporal/biquad.h"
     70#include "temporal/filter.h"
    7171#include "pitch/pitchdetection.h"
    7272#include "pitch/pitchmcomb.h"
    … …  
    8080#include "tempo/beattracking.h"
    8181#include "tempo/tempo.h"
    82 #include "filterbank.h"
    83 #include "mfcc.h"
     82#include "spectral/filterbank.h"
     83#include "spectral/mfcc.h"
    8484
    8585#ifdef __cplusplus

  • src/onset/onset.c

    rbcf38fe r32d6958  
    2121#include "sample.h"
    2222#include "onset/onsetdetection.h"
    23 #include "phasevoc.h"
    24 #include "peakpick.h"
     23#include "spectral/phasevoc.h"
     24#include "onset/peakpick.h"
    2525#include "mathutils.h"
    26 #include "onset.h"
     26#include "onset/onset.h"
    2727
    2828/** structure to store object state */

  • src/onset/onsetdetection.c

    rbcf38fe r32d6958  
    2020#include "aubio_priv.h"
    2121#include "sample.h"
    22 #include "fft.h"
     22#include "spectral/fft.h"
    2323#include "mathutils.h"
    24 #include "hist.h"
     24#include "utils/hist.h"
    2525#include "onset/onsetdetection.h"
    2626

  • src/onset/peakpick.c

    rbcf38fe r32d6958  
    2121#include "sample.h"
    2222#include "mathutils.h"
    23 #include "biquad.h"
    24 #include "peakpick.h"
     23#include "temporal/biquad.h"
     24#include "onset/peakpick.h"
    2525
    2626/* peak picking parameters, default values in brackets

  • src/pitch/pitchdetection.c

    rbcf38fe r32d6958  
    1919#include "aubio_priv.h"
    2020#include "sample.h"
    21 #include "phasevoc.h"
     21#include "spectral/phasevoc.h"
    2222#include "mathutils.h"
    23 #include "filter.h"
     23#include "temporal/filter.h"
    2424#include "pitch/pitchmcomb.h"
    2525#include "pitch/pitchyin.h"
    … …  
    2727#include "pitch/pitchschmitt.h"
    2828#include "pitch/pitchyinfft.h"
    29 #include "pitchdetection.h"
     29#include "pitch/pitchdetection.h"
    3030
    3131typedef smpl_t (*aubio_pitchdetection_func_t)

  • src/pitch/pitchfcomb.c

    rbcf38fe r32d6958  
    2121#include "sample.h"
    2222#include "mathutils.h"
    23 #include "fft.h"
     23#include "spectral/fft.h"
    2424#include "pitch/pitchfcomb.h"
    2525

  • src/pitch/pitchyinfft.c

    rbcf38fe r32d6958  
    2020#include "sample.h"
    2121#include "mathutils.h"
    22 #include "fft.h"
     22#include "spectral/fft.h"
    2323#include "pitch/pitchyinfft.h"
    2424

  • src/spectral/fft.c

    rbcf38fe r32d6958  
    2222#include "cvec.h"
    2323#include "mathutils.h"
    24 #include "fft.h"
     24#include "spectral/fft.h"
    2525
    2626#if FFTW3F_SUPPORT

  • src/spectral/filterbank.c

    rbcf38fe r32d6958  
    2222#include "aubio_priv.h"
    2323#include "sample.h"
    24 #include "filterbank.h"
     24#include "spectral/filterbank.h"
    2525#include "mathutils.h"
    2626

  • src/spectral/mfcc.c

    rbcf38fe r32d6958  
    2323#include "aubio_priv.h"
    2424#include "sample.h"
    25 #include "fft.h"
    26 #include "filterbank.h"
    27 #include "mfcc.h"
    28 #include "math.h"
     25#include "spectral/fft.h"
     26#include "spectral/filterbank.h"
     27#include "spectral/mfcc.h"
    2928
    3029/** Internal structure for mfcc object **/

  • src/spectral/mfcc.h

    rbcf38fe r32d6958  
    2929extern "C" {
    3030#endif
    31 
    32 #include "sample.h"
    33 #include "filterbank.h"
    3431
    3532typedef struct aubio_mfcc_t_ aubio_mfcc_t;

  • src/spectral/phasevoc.c

    rbcf38fe r32d6958  
    2121#include "fvec.h"
    2222#include "cvec.h"
    23 #include "fft.h"
    2423#include "mathutils.h"
    25 #include "phasevoc.h"
     24#include "spectral/fft.h"
     25#include "spectral/phasevoc.h"
    2626
    2727/** phasevocoder internal object */

  • src/spectral/tss.c

    rbcf38fe r32d6958  
    2323#include "sample.h"
    2424#include "mathutils.h"
    25 #include "tss.h"
     25#include "spectral/tss.h"
    2626
    2727struct _aubio_tss_t

  • src/tempo/beattracking.c

    rbcf38fe r32d6958  
    2121#include "sample.h"
    2222#include "mathutils.h"
    23 #include "beattracking.h"
     23#include "tempo/beattracking.h"
    2424
    2525uint_t fvec_gettimesig(smpl_t * acf, uint_t acflen, uint_t gp);

  • src/tempo/tempo.c

    rbcf38fe r32d6958  
    2222#include "onset/onsetdetection.h"
    2323#include "tempo/beattracking.h"
    24 #include "phasevoc.h"
     24#include "spectral/phasevoc.h"
    2525#include "onset/peakpick.h"
    2626#include "mathutils.h"
    27 #include "tempo.h"
     27#include "tempo/tempo.h"
    2828
    2929/* structure to store object state */

  • src/temporal/biquad.c

    rbcf38fe r32d6958  
    2121#include "sample.h"
    2222#include "mathutils.h"
    23 #include "biquad.h"
     23#include "temporal/biquad.h"
    2424
    2525/** \note this file needs to be in double or more less precision would lead to large

  • src/temporal/filter.c

    rbcf38fe r32d6958  
    2525#include "sample.h"
    2626#include "mathutils.h"
    27 #include "filter.h"
     27#include "temporal/filter.h"
    2828
    2929struct _aubio_filter_t {

  • src/temporal/resample.c

    rbcf38fe r32d6958  
    2323#include "aubio_priv.h"
    2424#include "sample.h"
    25 #include "resample.h"
     25#include "temporal/resample.h"
    2626
    2727struct _aubio_resampler_t {

  • src/utils/hist.c

    rbcf38fe r32d6958  
    1919#include "aubio_priv.h"
    2020#include "sample.h"
    21 #include "scale.h"
     21#include "utils/scale.h"
    2222#include "mathutils.h" //vec_min vec_max
    23 #include "hist.h"
     23#include "utils/hist.h"
    2424
    2525/********

  • src/utils/scale.c

    rbcf38fe r32d6958  
    2020#include "aubio_priv.h"
    2121#include "sample.h"
    22 #include "scale.h"
     22#include "utils/scale.h"
    2323
    2424struct _aubio_scale_t {
Note: See TracChangeset for help on using the changeset viewer.