Changeset 705aec8

Timestamp:

Sep 25, 2009, 10:12:56 PM (15 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:

d99d819

Parents:

be3ffee

Message:

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

Files:

• configure.ac (modified) (2 diffs)
• ext/Makefile.am (modified) (2 diffs)
• ext/aubioext.h (modified) (1 diff)
• ext/midi/list.c (deleted)
• ext/midi/list.h (deleted)
• ext/midi/midi.c (deleted)
• ext/midi/midi.h (deleted)
• ext/midi/midi_alsa_raw.c (deleted)
• ext/midi/midi_alsa_seq.c (deleted)
• ext/midi/midi_driver.c (deleted)
• ext/midi/midi_driver.h (deleted)
• ext/midi/midi_event.c (deleted)
• ext/midi/midi_event.h (deleted)
• ext/midi/midi_file.c (deleted)
• ext/midi/midi_file.h (deleted)
• ext/midi/midi_parser.c (deleted)
• ext/midi/midi_parser.h (deleted)
• ext/midi/midi_player.c (deleted)
• ext/midi/midi_player.h (deleted)
• ext/midi/midi_track.c (deleted)
• ext/midi/midi_track.h (deleted)
• ext/midi/timer.c (deleted)
• ext/midi/timer.h (deleted)
• ext/wscript_build (modified) (1 diff)
• wscript (modified) (2 diffs)

configure.ac

@@ -180 +180 @@
   if test "${HAVE_JACK}" = "1"; then
     AC_DEFINE(HAVE_JACK,1,[Define to enable jack support])
-  fi
-fi
-
-dnl Enable alsa support (auto)
-AC_ARG_ENABLE(alsa,
-  AC_HELP_STRING([--enable-alsa],[compile with alsa [[default=auto]]]),
-  [with_alsa=$enableval],
-  with_alsa="yes")
-if test "$with_alsa" = "yes"
-then
-  if test "$with_jack" = "yes"
-  then
-    PKG_CHECK_MODULES(ALSA,      alsa >= 0.0.9,      HAVE_ALSA=1, HAVE_ALSA=0)
-    if test "${HAVE_ALSA}" = "1"; then
-      AC_DEFINE(HAVE_ALSA,1,[Define to enable alsa support])
-    fi
-  else
-    AC_MSG_WARN([Disabling alsa as jack was not found])
   fi
 fi
@@ -294 +276 @@
   echo "JACK:                    no"
 fi
-if test "${HAVE_ALSA}" = "1"; then
-  echo "ALSA midi:               yes"
-else
-  echo "ALSA midi:               no"
-fi
 if test "${HAVE_LASH}" = "1"; then
   echo "Lash:                    yes"

ext/Makefile.am

@@ -3 +3 @@
         jackio.h \
         sndfileio.h
-
-pkgincludemididir = $(pkgincludedir)/midi
-pkgincludemidi_HEADERS = \
-        midi/midi.h \
-        midi/list.h \
-        midi/timer.h \
-        midi/midi_file.h \
-        midi/midi_driver.h \
-        midi/midi_event.h \
-        midi/midi_track.h \
-        midi/midi_player.h \
-        midi/midi_parser.h
 
 lib_LTLIBRARIES = libaubioext.la 
@@ -21 +9 @@
         jackio.h \
         sndfileio.c \
-        sndfileio.h \
-        midi/midi.c \
-        midi/midi.h \
-        midi/list.c \
-        midi/list.h \
-        midi/timer.c \
-        midi/timer.h \
-        midi/midi_alsa_seq.c \
-        midi/midi_alsa_raw.c \
-        midi/midi_file.c \
-        midi/midi_file.h \
-        midi/midi_event.c \
-        midi/midi_event.h \
-        midi/midi_track.c \
-        midi/midi_track.h \
-        midi/midi_player.c \
-        midi/midi_player.h \
-        midi/midi_parser.c \
-        midi/midi_parser.h \
-        midi/midi_driver.h \
-        midi/midi_driver.c
+        sndfileio.h 
 
-AM_CFLAGS = -I$(top_srcdir)/src @AUBIO_CFLAGS@ @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@ @ALSA_CFLAGS@
-libaubioext_la_LIBADD = -laubio -L${top_builddir}/src @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @ALSA_LIBS@ @LTLIBOBJS@
+AM_CFLAGS = -I$(top_srcdir)/src @AUBIO_CFLAGS@ @SNDLIB_CFLAGS@ @JACK_CFLAGS@ @FFTWLIB_CFLAGS@ @SAMPLERATE_CFLAGS@
+libaubioext_la_LIBADD = -laubio -L${top_builddir}/src @SNDLIB_LIBS@ @JACK_LIBS@ @FFTWLIB_LIBS@ @SAMPLERATE_LIBS@ @LTLIBOBJS@
 libaubioext_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@

ext/aubioext.h

@@ -32 +32 @@
 #endif 
 
-#if HAVE_ALSA
-#define ALSA_SUPPORT 1
-#endif
-
 #include "sndfileio.h"
-
-#include "midi/midi.h"
-#include "midi/midi_event.h"
-#include "midi/midi_track.h"
-#include "midi/midi_player.h"
-#include "midi/midi_parser.h"
-#include "midi/midi_file.h"
-#include "midi/midi_driver.h"
 
 #ifdef __cplusplus

ext/wscript_build

@@ -5 +5 @@
     source = bld.path.ant_glob('*.c **/*.c'),
     target = 'aubioext',
-    uselib = ['ALSA', 'SNDFILE', 'JACK'],
+    uselib = ['SNDFILE', 'JACK'],
     uselib_local = ['aubio'],
     vnum = bld.env['LIB_VERSION'])

wscript

@@ -27 +27 @@
   opt.add_option('--disable-jack', action='store_true', default=False,
       help='compile without jack support')
-  opt.add_option('--disable-alsa', action='store_true', default=False,
-      help='compile without alsa support')
   opt.add_option('--disable-lash', action='store_true', default=False,
       help='compile without lash support')
@@ -91 +89 @@
   if (Options.options.disable_jack == False):
     conf.check_cfg(package = 'jack', atleast_version = '0.15.0',
-    args = '--cflags --libs')
-  if (Options.options.disable_alsa == False):
-    conf.check_cfg(package = 'alsa', atleast_version = '0.0.9',
     args = '--cflags --libs')
   if (Options.options.disable_lash == False):