Changeset b60dd4ae


Ignore:
Timestamp:
Dec 6, 2004, 7:51:31 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:
205da86
Parents:
b16b900
Message:

moved midi functions to ext/

Files:
11 edited
20 moved

Legend:

Unmodified
Added
Removed

  • Makefile.am

    rb16b900 rb60dd4ae  
    1 SUBDIRS = src examples doc sounds swig python plugins
     1SUBDIRS = src ext examples doc sounds swig python plugins
    22EXTRA_DIST = bootstrap VERSION
    33DISTCLEANFILES = autom4te.cache

  • Makefile.in

    rb16b900 rb60dd4ae  
    152152sysconfdir = @sysconfdir@
    153153target_alias = @target_alias@
    154 SUBDIRS = src examples doc sounds swig python plugins
     154SUBDIRS = src ext examples doc sounds swig python plugins
    155155EXTRA_DIST = bootstrap VERSION
    156156DISTCLEANFILES = autom4te.cache

  • configure

    rb16b900 rb60dd4ae  
    2105421054
    2105521055
    21056                                                                                                                                   ac_config_files="$ac_config_files Makefile src/Makefile examples/Makefile sounds/Makefile doc/Makefile python/Makefile python/aubio/Makefile plugins/Makefile plugins/audacity/Makefile plugins/audacity/plug-ins/Makefile plugins/wavesurfer/Makefile plugins/puredata/Makefile swig/Makefile"
     21056                                                                                                                                            ac_config_files="$ac_config_files Makefile src/Makefile ext/Makefile examples/Makefile sounds/Makefile doc/Makefile python/Makefile python/aubio/Makefile plugins/Makefile plugins/audacity/Makefile plugins/audacity/plug-ins/Makefile plugins/wavesurfer/Makefile plugins/puredata/Makefile swig/Makefile"
    2105721057cat >confcache <<\_ACEOF
    2105821058# This file is a shell script that caches the results of configure
    … …  
    2161421614  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
    2161521615  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     21616  "ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;;
    2161621617  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
    2161721618  "sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES sounds/Makefile" ;;

  • configure.ac

    rb16b900 rb60dd4ae  
    151151                Makefile
    152152                src/Makefile
     153                ext/Makefile
    153154                examples/Makefile
    154155                sounds/Makefile

  • examples/Makefile.am

    rb16b900 rb60dd4ae  
    1 
    21#SUBDIRS=onsets
    32
    43# global flags
    5 AM_CFLAGS = -I../src @LADCCA_CFLAGS@
    6 AM_LDFLAGS = -L../src @LADCCA_LIBS@ -laubio
     4AM_CFLAGS = -I../src -I../ext @LADCCA_CFLAGS@
     5AM_LDFLAGS = -L../src -L../ext @LADCCA_LIBS@ -laubioext -laubio
    76#AM_SOURCES = utils.c
    87

  • examples/Makefile.in

    rb16b900 rb60dd4ae  
    156156
    157157# global flags
    158 AM_CFLAGS = -I../src @LADCCA_CFLAGS@
    159 AM_LDFLAGS = -L../src @LADCCA_LIBS@ -laubio
     158AM_CFLAGS = -I../src -I../ext @LADCCA_CFLAGS@
     159AM_LDFLAGS = -L../src -L../ext @LADCCA_LIBS@ -laubioext -laubio
    160160#AM_SOURCES = utils.c
    161161

  • examples/aubionotes.c

    rb16b900 rb60dd4ae  
    2424#include <math.h> // how do i do a floorf with a mask again ?
    2525#include "aubio.h"
     26#include "aubioext.h"
    2627#include "utils.h"
    2728

  • examples/aubionotesmedian.c

    rb16b900 rb60dd4ae  
    2323#include <unistd.h>
    2424#include "aubio.h"
     25#include "aubioext.h"
    2526#include "utils.h"
    2627

  • src/Makefile.am

    rb16b900 rb60dd4ae  
    2020        pitchmcomb.h \
    2121        pitchyin.h \
    22         filter.h \
    23         midi.h \
    24         list.h \
    25         timer.h \
    26         midi_file.h \
    27         midi_driver.h \
    28         midi_event.h \
    29         midi_track.h \
    30         midi_player.h \
    31         midi_parser.h
     22        filter.h
    3223
    3324lib_LTLIBRARIES = libaubio.la
    … …  
    6758        pitchyin.h \
    6859        filter.c \
    69         filter.h \
    70         midi.c \
    71         midi.h \
    72         list.c \
    73         list.h \
    74         timer.c \
    75         timer.h \
    76         midi_alsa_seq.c \
    77         midi_alsa_raw.c \
    78         midi_file.c \
    79         midi_file.h \
    80         midi_event.c \
    81         midi_event.h \
    82         midi_track.c \
    83         midi_track.h \
    84         midi_player.c \
    85         midi_player.h \
    86         midi_parser.c \
    87         midi_parser.h \
    88         midi_driver.h \
    89         midi_driver.c
     60        filter.h
    9061
    91 AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@
    92 libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
     62AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @LADCCA_CFLAGS@
     63libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@

  • src/Makefile.in

    rb16b900 rb60dd4ae  
    173173        pitchmcomb.h \
    174174        pitchyin.h \
    175         filter.h \
    176         midi.h \
    177         list.h \
    178         timer.h \
    179         midi_file.h \
    180         midi_driver.h \
    181         midi_event.h \
    182         midi_track.h \
    183         midi_player.h \
    184         midi_parser.h
     175        filter.h
    185176
    186177
    … …  
    221212        pitchyin.h \
    222213        filter.c \
    223         filter.h \
    224         midi.c \
    225         midi.h \
    226         list.c \
    227         list.h \
    228         timer.c \
    229         timer.h \
    230         midi_alsa_seq.c \
    231         midi_alsa_raw.c \
    232         midi_file.c \
    233         midi_file.h \
    234         midi_event.c \
    235         midi_event.h \
    236         midi_track.c \
    237         midi_track.h \
    238         midi_player.c \
    239         midi_player.h \
    240         midi_parser.c \
    241         midi_parser.h \
    242         midi_driver.h \
    243         midi_driver.c
    244 
    245 
    246 AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@
    247 libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
     214        filter.h
     215
     216
     217AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @LADCCA_CFLAGS@
     218libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@
    248219subdir = src
    249220ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    … …  
    258229        fft.lo sample.lo hist.lo scale.lo resample.lo onsetdetection.lo \
    259230        tss.lo peakpick.lo biquad.lo pitchdetection.lo pitchmcomb.lo \
    260         pitchyin.lo filter.lo midi.lo list.lo timer.lo midi_alsa_seq.lo \
    261         midi_alsa_raw.lo midi_file.lo midi_event.lo midi_track.lo \
    262         midi_player.lo midi_parser.lo midi_driver.lo
     231        pitchyin.lo filter.lo
    263232libaubio_la_OBJECTS = $(am_libaubio_la_OBJECTS)
    264233
    … …  
    268237@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/biquad.Plo ./$(DEPDIR)/fft.Plo \
    269238@AMDEP_TRUE@    ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/hist.Plo \
    270 @AMDEP_TRUE@    ./$(DEPDIR)/jackio.Plo ./$(DEPDIR)/list.Plo \
    271 @AMDEP_TRUE@    ./$(DEPDIR)/mathutils.Plo ./$(DEPDIR)/midi.Plo \
    272 @AMDEP_TRUE@    ./$(DEPDIR)/midi_alsa_raw.Plo \
    273 @AMDEP_TRUE@    ./$(DEPDIR)/midi_alsa_seq.Plo \
    274 @AMDEP_TRUE@    ./$(DEPDIR)/midi_driver.Plo \
    275 @AMDEP_TRUE@    ./$(DEPDIR)/midi_event.Plo \
    276 @AMDEP_TRUE@    ./$(DEPDIR)/midi_file.Plo \
    277 @AMDEP_TRUE@    ./$(DEPDIR)/midi_parser.Plo \
    278 @AMDEP_TRUE@    ./$(DEPDIR)/midi_player.Plo \
    279 @AMDEP_TRUE@    ./$(DEPDIR)/midi_track.Plo \
     239@AMDEP_TRUE@    ./$(DEPDIR)/jackio.Plo ./$(DEPDIR)/mathutils.Plo \
    280240@AMDEP_TRUE@    ./$(DEPDIR)/onsetdetection.Plo \
    281241@AMDEP_TRUE@    ./$(DEPDIR)/peakpick.Plo ./$(DEPDIR)/phasevoc.Plo \
    … …  
    284244@AMDEP_TRUE@    ./$(DEPDIR)/resample.Plo ./$(DEPDIR)/sample.Plo \
    285245@AMDEP_TRUE@    ./$(DEPDIR)/scale.Plo ./$(DEPDIR)/sndfileio.Plo \
    286 @AMDEP_TRUE@    ./$(DEPDIR)/timer.Plo ./$(DEPDIR)/tss.Plo
     246@AMDEP_TRUE@    ./$(DEPDIR)/tss.Plo
    287247COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    288248        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    … …  
    368328@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist.Plo@am__quote@
    369329@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jackio.Plo@am__quote@
    370 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
    371330@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathutils.Plo@am__quote@
    372 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi.Plo@am__quote@
    373 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_alsa_raw.Plo@am__quote@
    374 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_alsa_seq.Plo@am__quote@
    375 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_driver.Plo@am__quote@
    376 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_event.Plo@am__quote@
    377 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_file.Plo@am__quote@
    378 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_parser.Plo@am__quote@
    379 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_player.Plo@am__quote@
    380 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_track.Plo@am__quote@
    381331@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onsetdetection.Plo@am__quote@
    382332@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peakpick.Plo@am__quote@
    … …  
    389339@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scale.Plo@am__quote@
    390340@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sndfileio.Plo@am__quote@
    391 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@
    392341@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tss.Plo@am__quote@
    393342

  • src/aubio.h

    rb16b900 rb60dd4ae  
    2020/** @mainpage
    2121 *
    22  * \section whatis All starts here ...
     22 * \section whatis Introduction
    2323 *
    24  *      Aubio (note i need another name for this program) is a small library
    25  *      for audio and control processing. The aim of this project is educative
    26  *      (for me, and all the others who might want to use it). The main purpose of
    27  *      aubio is to experiment with some bleeding-edge algorithms in a real time
    28  *      context. This library targets at being light and portable, and relatively
    29  *      fast.
    30  *
    31  *      aubio is implemented as a library of C units and functions. You can create
    32  *      all the C objects you need in your processing function, process those
    33  *      objects from a main callback function, and delete them when done.  This
    34  *      simple but efficient way makes it easy to write a small wrapper, for
    35  *      instance in the python language. (actually, GUIs should probably be build
    36  *      with python itself). Writing LADSPA, jmax, pd, or any other like audio
    37  *      plugins should be feasible too.
    38  *     
    39  *      Aubio provides various tools, some of them are listed below. I added the
    40  *      names of the original authors and references to corresponding articles
    41  *      are in the corresponding source file.
    42  *
    43  *        - various maths tools
    44  *        - phase vocoder
    45  *        - up/downsampling
    46  *        - filtering (n pole/zero pairs)
    47  *        - onset detection functions
    48  *        - onset peak picking
    49  *        - multicomb-filtering pitch detection
    50  *        - transient/steady-state separation
    51  *        - audio and midi devices abstractions (callback)
    52  *        - audio and midi files abstractions (various access modes)
    53  *
    54  *      The midi support is kindly borrowed from the powerful Fluidsynth, written
    55  *      by Peter Hanappe.
    56  *
    57  *      See the README file for more information.
     24 *      Aubio is a library for audio labelling: it provides function for pitch
     25 *      estimation and onset detection.  See the README file for more
     26 *      information.
    5827 *
    5928 * \section bugs bugs and todo
    6029 *
    61  *      This software is under development. It needs debugging and optimisations.
     30 *      This software is under development. It needs debugging and
     31 *      optimisations.
    6232 *
    6333 *  See <a href='bug.html'>bugs</a> and <a href='todo.html'>todo</a> lists.
    … …  
    11080#include "pitchyin.h"
    11181
    112 #include "midi.h"
    113 #include "midi_event.h"
    114 #include "midi_track.h"
    115 #include "midi_player.h"
    116 #include "midi_parser.h"
    117 #include "midi_file.h"
    118 #include "midi_driver.h"
    119 
    12082#ifdef __cplusplus
    12183} /* extern "C" */
Note: See TracChangeset for help on using the changeset viewer.