Changeset 705aec8


Ignore:
Timestamp:
Sep 25, 2009, 10:12:56 PM (10 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
d99d819
Parents:
be3ffee
Message:

ext/midi: remove all midi stuff borrowed from fluidsynth, now unused

Files:
20 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • configure.ac

    rbe3ffee r705aec8  
    180180  if test "${HAVE_JACK}" = "1"; then
    181181    AC_DEFINE(HAVE_JACK,1,[Define to enable jack support])
    182   fi
    183 fi
    184 
    185 dnl Enable alsa support (auto)
    186 AC_ARG_ENABLE(alsa,
    187   AC_HELP_STRING([--enable-alsa],[compile with alsa [[default=auto]]]),
    188   [with_alsa=$enableval],
    189   with_alsa="yes")
    190 if test "$with_alsa" = "yes"
    191 then
    192   if test "$with_jack" = "yes"
    193   then
    194     PKG_CHECK_MODULES(ALSA,      alsa >= 0.0.9,      HAVE_ALSA=1, HAVE_ALSA=0)
    195     if test "${HAVE_ALSA}" = "1"; then
    196       AC_DEFINE(HAVE_ALSA,1,[Define to enable alsa support])
    197     fi
    198   else
    199     AC_MSG_WARN([Disabling alsa as jack was not found])
    200182  fi
    201183fi
     
    294276  echo "JACK:                    no"
    295277fi
    296 if test "${HAVE_ALSA}" = "1"; then
    297   echo "ALSA midi:               yes"
    298 else
    299   echo "ALSA midi:               no"
    300 fi
    301278if test "${HAVE_LASH}" = "1"; then
    302279  echo "Lash:                    yes"
  • ext/Makefile.am

    rbe3ffee r705aec8  
    33        jackio.h \
    44        sndfileio.h
    5 
    6 pkgincludemididir = $(pkgincludedir)/midi
    7 pkgincludemidi_HEADERS = \
    8         midi/midi.h \
    9         midi/list.h \
    10         midi/timer.h \
    11         midi/midi_file.h \
    12         midi/midi_driver.h \
    13         midi/midi_event.h \
    14         midi/midi_track.h \
    15         midi/midi_player.h \
    16         midi/midi_parser.h
    175
    186lib_LTLIBRARIES = libaubioext.la
     
    219        jackio.h \
    2210        sndfileio.c \
    23         sndfileio.h \
    24         midi/midi.c \
    25         midi/midi.h \
    26         midi/list.c \
    27         midi/list.h \
    28         midi/timer.c \
    29         midi/timer.h \
    30         midi/midi_alsa_seq.c \
    31         midi/midi_alsa_raw.c \
    32         midi/midi_file.c \
    33         midi/midi_file.h \
    34         midi/midi_event.c \
    35         midi/midi_event.h \
    36         midi/midi_track.c \
    37         midi/midi_track.h \
    38         midi/midi_player.c \
    39         midi/midi_player.h \
    40         midi/midi_parser.c \
    41         midi/midi_parser.h \
    42         midi/midi_driver.h \
    43         midi/midi_driver.c
     11        sndfileio.h
    4412
    45 AM_CFLAGS = -I$(top_srcdir)/src @AUBIO_CFLAGS@ @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@
    46 libaubioext_la_LIBADD = -laubio -L${top_builddir}/src @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LTLIBOBJS@
     13AM_CFLAGS = -I$(top_srcdir)/src @AUBIO_CFLAGS@ @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
     14libaubioext_la_LIBADD = -laubio -L${top_builddir}/src @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
    4715libaubioext_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
  • ext/aubioext.h

    rbe3ffee r705aec8  
    3232#endif
    3333
    34 #if HAVE_ALSA
    35 #define ALSA_SUPPORT 1
    36 #endif
    37 
    3834#include "sndfileio.h"
    39 
    40 #include "midi/midi.h"
    41 #include "midi/midi_event.h"
    42 #include "midi/midi_track.h"
    43 #include "midi/midi_player.h"
    44 #include "midi/midi_parser.h"
    45 #include "midi/midi_file.h"
    46 #include "midi/midi_driver.h"
    4735
    4836#ifdef __cplusplus
  • ext/wscript_build

    rbe3ffee r705aec8  
    55    source = bld.path.ant_glob('*.c **/*.c'),
    66    target = 'aubioext',
    7     uselib = ['ALSA', 'SNDFILE', 'JACK'],
     7    uselib = ['SNDFILE', 'JACK'],
    88    uselib_local = ['aubio'],
    99    vnum = bld.env['LIB_VERSION'])
  • wscript

    rbe3ffee r705aec8  
    2727  opt.add_option('--disable-jack', action='store_true', default=False,
    2828      help='compile without jack support')
    29   opt.add_option('--disable-alsa', action='store_true', default=False,
    30       help='compile without alsa support')
    3129  opt.add_option('--disable-lash', action='store_true', default=False,
    3230      help='compile without lash support')
     
    9189  if (Options.options.disable_jack == False):
    9290    conf.check_cfg(package = 'jack', atleast_version = '0.15.0',
    93     args = '--cflags --libs')
    94   if (Options.options.disable_alsa == False):
    95     conf.check_cfg(package = 'alsa', atleast_version = '0.0.9',
    9691    args = '--cflags --libs')
    9792  if (Options.options.disable_lash == False):
Note: See TracChangeset for help on using the changeset viewer.