From: Paul Brossier Date: Mon, 6 Dec 2004 18:51:31 +0000 (+0000) Subject: moved midi functions to ext/ X-Git-Tag: bzr2git~942 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b60dd4ae028d987b1e9bdbd6b71e62f529465109;p=aubio.git moved midi functions to ext/ --- diff --git a/Makefile.am b/Makefile.am index fc8781c6..76ae2e62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = src examples doc sounds swig python plugins +SUBDIRS = src ext examples doc sounds swig python plugins EXTRA_DIST = bootstrap VERSION DISTCLEANFILES = autom4te.cache diff --git a/Makefile.in b/Makefile.in index 1b08cb69..0f400b84 100644 --- a/Makefile.in +++ b/Makefile.in @@ -151,7 +151,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -SUBDIRS = src examples doc sounds swig python plugins +SUBDIRS = src ext examples doc sounds swig python plugins EXTRA_DIST = bootstrap VERSION DISTCLEANFILES = autom4te.cache subdir = . diff --git a/configure b/configure index 1a9dc0e5..a7d8d55c 100755 --- a/configure +++ b/configure @@ -21053,7 +21053,7 @@ echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 - 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" + 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" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -21613,6 +21613,7 @@ do "aubio.pc" ) CONFIG_FILES="$CONFIG_FILES aubio.pc" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; + "ext/Makefile" ) CONFIG_FILES="$CONFIG_FILES ext/Makefile" ;; "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; "sounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES sounds/Makefile" ;; "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; diff --git a/configure.ac b/configure.ac index 17320be7..d6e13495 100644 --- a/configure.ac +++ b/configure.ac @@ -150,6 +150,7 @@ AM_PATH_PYTHON(,,) AC_OUTPUT([ Makefile src/Makefile + ext/Makefile examples/Makefile sounds/Makefile doc/Makefile diff --git a/examples/Makefile.am b/examples/Makefile.am index 1c32606d..eb03387a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,9 +1,8 @@ - #SUBDIRS=onsets # global flags -AM_CFLAGS = -I../src @LADCCA_CFLAGS@ -AM_LDFLAGS = -L../src @LADCCA_LIBS@ -laubio +AM_CFLAGS = -I../src -I../ext @LADCCA_CFLAGS@ +AM_LDFLAGS = -L../src -L../ext @LADCCA_LIBS@ -laubioext -laubio #AM_SOURCES = utils.c # add your programs to this list diff --git a/examples/Makefile.in b/examples/Makefile.in index 06f720d7..d2b6c4a0 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -155,8 +155,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ # global flags -AM_CFLAGS = -I../src @LADCCA_CFLAGS@ -AM_LDFLAGS = -L../src @LADCCA_LIBS@ -laubio +AM_CFLAGS = -I../src -I../ext @LADCCA_CFLAGS@ +AM_LDFLAGS = -L../src -L../ext @LADCCA_LIBS@ -laubioext -laubio #AM_SOURCES = utils.c # add your programs to this list diff --git a/examples/aubionotes.c b/examples/aubionotes.c index 36840d3a..aad56a15 100644 --- a/examples/aubionotes.c +++ b/examples/aubionotes.c @@ -23,6 +23,7 @@ #include #include // how do i do a floorf with a mask again ? #include "aubio.h" +#include "aubioext.h" #include "utils.h" /* settings */ diff --git a/examples/aubionotesmedian.c b/examples/aubionotesmedian.c index b59cff08..0cdc31d0 100644 --- a/examples/aubionotesmedian.c +++ b/examples/aubionotesmedian.c @@ -22,6 +22,7 @@ #include #include #include "aubio.h" +#include "aubioext.h" #include "utils.h" #include //required for FLOORF :( diff --git a/src/list.c b/ext/midi/list.c similarity index 100% rename from src/list.c rename to ext/midi/list.c diff --git a/src/list.h b/ext/midi/list.h similarity index 100% rename from src/list.h rename to ext/midi/list.h diff --git a/src/midi.c b/ext/midi/midi.c similarity index 100% rename from src/midi.c rename to ext/midi/midi.c diff --git a/src/midi.h b/ext/midi/midi.h similarity index 100% rename from src/midi.h rename to ext/midi/midi.h diff --git a/src/midi_alsa_raw.c b/ext/midi/midi_alsa_raw.c similarity index 100% rename from src/midi_alsa_raw.c rename to ext/midi/midi_alsa_raw.c diff --git a/src/midi_alsa_seq.c b/ext/midi/midi_alsa_seq.c similarity index 100% rename from src/midi_alsa_seq.c rename to ext/midi/midi_alsa_seq.c diff --git a/src/midi_driver.c b/ext/midi/midi_driver.c similarity index 100% rename from src/midi_driver.c rename to ext/midi/midi_driver.c diff --git a/src/midi_driver.h b/ext/midi/midi_driver.h similarity index 100% rename from src/midi_driver.h rename to ext/midi/midi_driver.h diff --git a/src/midi_event.c b/ext/midi/midi_event.c similarity index 100% rename from src/midi_event.c rename to ext/midi/midi_event.c diff --git a/src/midi_event.h b/ext/midi/midi_event.h similarity index 100% rename from src/midi_event.h rename to ext/midi/midi_event.h diff --git a/src/midi_file.c b/ext/midi/midi_file.c similarity index 100% rename from src/midi_file.c rename to ext/midi/midi_file.c diff --git a/src/midi_file.h b/ext/midi/midi_file.h similarity index 100% rename from src/midi_file.h rename to ext/midi/midi_file.h diff --git a/src/midi_parser.c b/ext/midi/midi_parser.c similarity index 100% rename from src/midi_parser.c rename to ext/midi/midi_parser.c diff --git a/src/midi_parser.h b/ext/midi/midi_parser.h similarity index 100% rename from src/midi_parser.h rename to ext/midi/midi_parser.h diff --git a/src/midi_player.c b/ext/midi/midi_player.c similarity index 100% rename from src/midi_player.c rename to ext/midi/midi_player.c diff --git a/src/midi_player.h b/ext/midi/midi_player.h similarity index 100% rename from src/midi_player.h rename to ext/midi/midi_player.h diff --git a/src/midi_track.c b/ext/midi/midi_track.c similarity index 100% rename from src/midi_track.c rename to ext/midi/midi_track.c diff --git a/src/midi_track.h b/ext/midi/midi_track.h similarity index 100% rename from src/midi_track.h rename to ext/midi/midi_track.h diff --git a/src/timer.c b/ext/midi/timer.c similarity index 100% rename from src/timer.c rename to ext/midi/timer.c diff --git a/src/timer.h b/ext/midi/timer.h similarity index 100% rename from src/timer.h rename to ext/midi/timer.h diff --git a/src/Makefile.am b/src/Makefile.am index add28fc8..1311c530 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,16 +19,7 @@ pkginclude_HEADERS = aubio.h \ pitchdetection.h \ pitchmcomb.h \ pitchyin.h \ - filter.h \ - midi.h \ - list.h \ - timer.h \ - midi_file.h \ - midi_driver.h \ - midi_event.h \ - midi_track.h \ - midi_player.h \ - midi_parser.h + filter.h lib_LTLIBRARIES = libaubio.la libaubio_la_SOURCES = aubio.h \ @@ -66,27 +57,7 @@ libaubio_la_SOURCES = aubio.h \ pitchyin.c \ pitchyin.h \ filter.c \ - filter.h \ - midi.c \ - midi.h \ - list.c \ - list.h \ - timer.c \ - timer.h \ - midi_alsa_seq.c \ - midi_alsa_raw.c \ - midi_file.c \ - midi_file.h \ - midi_event.c \ - midi_event.h \ - midi_track.c \ - midi_track.h \ - midi_player.c \ - midi_player.h \ - midi_parser.c \ - midi_parser.h \ - midi_driver.h \ - midi_driver.c + filter.h -AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@ -libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@ +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@ diff --git a/src/Makefile.in b/src/Makefile.in index c90116cc..308797f2 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -172,16 +172,7 @@ pkginclude_HEADERS = aubio.h \ pitchdetection.h \ pitchmcomb.h \ pitchyin.h \ - filter.h \ - midi.h \ - list.h \ - timer.h \ - midi_file.h \ - midi_driver.h \ - midi_event.h \ - midi_track.h \ - midi_player.h \ - midi_parser.h + filter.h lib_LTLIBRARIES = libaubio.la @@ -220,31 +211,11 @@ libaubio_la_SOURCES = aubio.h \ pitchyin.c \ pitchyin.h \ filter.c \ - filter.h \ - midi.c \ - midi.h \ - list.c \ - list.h \ - timer.c \ - timer.h \ - midi_alsa_seq.c \ - midi_alsa_raw.c \ - midi_file.c \ - midi_file.h \ - midi_event.c \ - midi_event.h \ - midi_track.c \ - midi_track.h \ - midi_player.c \ - midi_player.h \ - midi_parser.c \ - midi_parser.h \ - midi_driver.h \ - midi_driver.c - - -AM_CFLAGS = @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@ @LADCCA_CFLAGS@ -libaubio_la_LIBADD = @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LADCCA_LIBS@ @LTLIBOBJS@ + 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@ subdir = src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -257,9 +228,7 @@ 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 \ - pitchyin.lo filter.lo midi.lo list.lo timer.lo midi_alsa_seq.lo \ - midi_alsa_raw.lo midi_file.lo midi_event.lo midi_track.lo \ - midi_player.lo midi_parser.lo midi_driver.lo + pitchyin.lo filter.lo libaubio_la_OBJECTS = $(am_libaubio_la_OBJECTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I. @@ -267,23 +236,14 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/biquad.Plo ./$(DEPDIR)/fft.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/filter.Plo ./$(DEPDIR)/hist.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/jackio.Plo ./$(DEPDIR)/list.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/mathutils.Plo ./$(DEPDIR)/midi.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_alsa_raw.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_alsa_seq.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_driver.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_event.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_file.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_parser.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_player.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/midi_track.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/jackio.Plo ./$(DEPDIR)/mathutils.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/onsetdetection.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/peakpick.Plo ./$(DEPDIR)/phasevoc.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/pitchdetection.Plo \ @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)/timer.Plo ./$(DEPDIR)/tss.Plo +@AMDEP_TRUE@ ./$(DEPDIR)/tss.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -367,17 +327,7 @@ distclean-compile: @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)/list.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mathutils.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_alsa_raw.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_alsa_seq.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_driver.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_event.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_file.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_parser.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_player.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midi_track.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onsetdetection.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/peakpick.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/phasevoc.Plo@am__quote@ @@ -388,7 +338,6 @@ distclean-compile: @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)/timer.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tss.Plo@am__quote@ .c.o: diff --git a/src/aubio.h b/src/aubio.h index f0f9c61e..31efae2c 100644 --- a/src/aubio.h +++ b/src/aubio.h @@ -19,46 +19,16 @@ /** @mainpage * - * \section whatis All starts here ... + * \section whatis Introduction * - * Aubio (note i need another name for this program) is a small library - * for audio and control processing. The aim of this project is educative - * (for me, and all the others who might want to use it). The main purpose of - * aubio is to experiment with some bleeding-edge algorithms in a real time - * context. This library targets at being light and portable, and relatively - * fast. - * - * aubio is implemented as a library of C units and functions. You can create - * all the C objects you need in your processing function, process those - * objects from a main callback function, and delete them when done. This - * simple but efficient way makes it easy to write a small wrapper, for - * instance in the python language. (actually, GUIs should probably be build - * with python itself). Writing LADSPA, jmax, pd, or any other like audio - * plugins should be feasible too. - * - * Aubio provides various tools, some of them are listed below. I added the - * names of the original authors and references to corresponding articles - * are in the corresponding source file. - * - * - various maths tools - * - phase vocoder - * - up/downsampling - * - filtering (n pole/zero pairs) - * - onset detection functions - * - onset peak picking - * - multicomb-filtering pitch detection - * - transient/steady-state separation - * - audio and midi devices abstractions (callback) - * - audio and midi files abstractions (various access modes) - * - * The midi support is kindly borrowed from the powerful Fluidsynth, written - * by Peter Hanappe. - * - * See the README file for more information. + * Aubio is a library for audio labelling: it provides function for pitch + * estimation and onset detection. See the README file for more + * information. * * \section bugs bugs and todo * - * This software is under development. It needs debugging and optimisations. + * This software is under development. It needs debugging and + * optimisations. * * See bugs and todo lists. * @@ -109,14 +79,6 @@ extern "C" { #include "pitchmcomb.h" #include "pitchyin.h" -#include "midi.h" -#include "midi_event.h" -#include "midi_track.h" -#include "midi_player.h" -#include "midi_parser.h" -#include "midi_file.h" -#include "midi_driver.h" - #ifdef __cplusplus } /* extern "C" */ #endif