Changes in / [af27265:d67a08e]

Files:

• src/aubio.h (modified) (1 diff)
• src/io/source.c (modified) (3 diffs)
• src/io/source_avcodec.c (deleted)
• src/io/source_avcodec.h (deleted)
• src/io/source_sndfile.c (modified) (1 diff)
• src/wscript_build (modified) (1 diff)
• tests/src/io/test-source_avcodec.c (deleted)
• tests/src/io/test-source_sndfile.c (modified) (2 diffs)
• wscript (modified) (2 diffs)

src/aubio.h

@@ -194 +194 @@
 #include "io/source_sndfile.h"
 #include "io/source_apple_audio.h"
-#include "io/source_avcodec.h"
 #include "io/sink_sndfile.h"
 #include "io/sink_apple_audio.h"

src/io/source.c

@@ -24 +24 @@
 #include "fmat.h"
 #include "io/source.h"
-#ifdef HAVE_AVCODEC
-#include "io/source_avcodec.h"
-#endif /* HAVE_AVCODEC */
 #ifdef __APPLE__
 #include "io/source_apple_audio.h"
@@ -32 +29 @@
 #ifdef HAVE_SNDFILE
 #include "io/source_sndfile.h"
-#endif /* HAVE_SNDFILE */
-
-typedef void (*aubio_source_do_t)(aubio_source_t * s, fvec_t * data, uint_t * read);
-typedef void (*aubio_source_do_multi_t)(aubio_source_t * s, fmat_t * data, uint_t * read);
-typedef uint_t (*aubio_source_get_samplerate_t)(aubio_source_t * s);
-typedef uint_t (*aubio_source_get_channels_t)(aubio_source_t * s);
-typedef uint_t (*aubio_source_seek_t)(aubio_source_t * s, uint_t seek);
-typedef uint_t (*del_aubio_source_t)(aubio_source_t * s);
+#endif
 
 struct _aubio_source_t { 
   void *source;
-  aubio_source_do_t s_do;
-  aubio_source_do_multi_t s_do_multi;
-  aubio_source_get_samplerate_t s_get_samplerate;
-  aubio_source_get_channels_t s_get_channels;
-  aubio_source_seek_t s_seek;
-  del_aubio_source_t s_del;
 };
 
 aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) {
   aubio_source_t * s = AUBIO_NEW(aubio_source_t);
-#if HAVE_AVCODEC
-  s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size);
-  if (s->source) {
-    s->s_do = (aubio_source_do_t)(aubio_source_avcodec_do);
-    s->s_do_multi = (aubio_source_do_multi_t)(aubio_source_avcodec_do_multi);
-    s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_avcodec_get_channels);
-    s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_avcodec_get_samplerate);
-    s->s_seek = (aubio_source_seek_t)(aubio_source_avcodec_seek);
-    s->s_del = (del_aubio_source_t)(del_aubio_source_avcodec);
-    return s;
-  }
-#endif /* HAVE_AVCODEC */
 #ifdef __APPLE__
   s->source = (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);
-  if (s->source) {
-    s->s_do = (aubio_source_do_t)(aubio_source_apple_audio_do);
-    s->s_do_multi = (aubio_source_do_multi_t)(aubio_source_apple_audio_do_multi);
-    s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_apple_audio_get_channels);
-    s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_apple_audio_get_samplerate);
-    s->s_seek = (aubio_source_seek_t)(aubio_source_apple_audio_seek);
-    s->s_del = (del_aubio_source_t)(del_aubio_source_apple_audio);
-    return s;
-  }
-#endif /* __APPLE__ */
+  if (s->source) return s;
+#else /* __APPLE__ */
 #if HAVE_SNDFILE
   s->source = (void *)new_aubio_source_sndfile(uri, samplerate, hop_size);
-  if (s->source) {
-    s->s_do = (aubio_source_do_t)(aubio_source_sndfile_do);
-    s->s_do_multi = (aubio_source_do_multi_t)(aubio_source_sndfile_do_multi);
-    s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_sndfile_get_channels);
-    s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_sndfile_get_samplerate);
-    s->s_seek = (aubio_source_seek_t)(aubio_source_sndfile_seek);
-    s->s_del = (del_aubio_source_t)(del_aubio_source_sndfile);
-    return s;
-  }
+  if (s->source) return s;
 #endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
   AUBIO_ERROR("failed creating aubio source with %s\n", uri);
   AUBIO_FREE(s);
@@ -95 +52 @@
 
 void aubio_source_do(aubio_source_t * s, fvec_t * data, uint_t * read) {
-  s->s_do((void *)s->source, data, read);
+#ifdef __APPLE__
+  aubio_source_apple_audio_do((aubio_source_apple_audio_t *)s->source, data, read);
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  aubio_source_sndfile_do((aubio_source_sndfile_t *)s->source, data, read);
+#endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
 }
 
 void aubio_source_do_multi(aubio_source_t * s, fmat_t * data, uint_t * read) {
-  s->s_do_multi((void *)s->source, data, read);
+#ifdef __APPLE__
+  aubio_source_apple_audio_do_multi((aubio_source_apple_audio_t *)s->source, data, read);
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  aubio_source_sndfile_do_multi((aubio_source_sndfile_t *)s->source, data, read);
+#endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
 }
 
 void del_aubio_source(aubio_source_t * s) {
   if (!s) return;
-  s->s_del((void *)s->source);
+#ifdef __APPLE__
+  del_aubio_source_apple_audio((aubio_source_apple_audio_t *)s->source);
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  del_aubio_source_sndfile((aubio_source_sndfile_t *)s->source);
+#endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
   AUBIO_FREE(s);
 }
 
 uint_t aubio_source_get_samplerate(aubio_source_t * s) {
-  return s->s_get_samplerate((void *)s->source);
+#ifdef __APPLE__
+  return aubio_source_apple_audio_get_samplerate((aubio_source_apple_audio_t *)s->source);
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  return aubio_source_sndfile_get_samplerate((aubio_source_sndfile_t *)s->source);
+#endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
 }
 
 uint_t aubio_source_get_channels(aubio_source_t * s) {
-  return s->s_get_channels((void *)s->source);
+#ifdef __APPLE__
+  return aubio_source_apple_audio_get_channels((aubio_source_apple_audio_t *)s->source);
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  return aubio_source_sndfile_get_channels((aubio_source_sndfile_t *)s->source);
+#endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
 }
 
 uint_t aubio_source_seek (aubio_source_t * s, uint_t seek ) {
-  return s->s_seek((void *)s->source, seek);
+#ifdef __APPLE__
+  return aubio_source_apple_audio_seek ((aubio_source_apple_audio_t *)s->source, seek);
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  return aubio_source_sndfile_seek ((aubio_source_sndfile_t *)s->source, seek);
+#endif /* HAVE_SNDFILE */
+#endif /* __APPLE__ */
 }

src/io/source_sndfile.c

@@ -74 +74 @@
   s->path = path;
 
-  // try opening the file, getting the info in sfinfo
+  // try opening the file, geting the info in sfinfo
   SF_INFO sfinfo;
   AUBIO_MEMSET(&sfinfo, 0, sizeof (sfinfo));

src/wscript_build

@@ -6 +6 @@
 uselib += ['SAMPLERATE']
 uselib += ['SNDFILE']
-uselib += ['AVCODEC']
-uselib += ['AVFORMAT']
-uselib += ['AVRESAMPLE']
-uselib += ['AVUTIL']
 uselib += ['JACK']
 uselib += ['LASH']

tests/src/io/test-source_sndfile.c

@@ -18 +18 @@
 
 #ifdef HAVE_SNDFILE
-  uint_t samplerate = 0;
+  uint_t samplerate = 32000;
   uint_t hop_size = 256;
   uint_t n_frames = 0, read = 0;
@@ -32 +32 @@
   do {
     aubio_source_sndfile_do(s, vec, &read);
-    fvec_print (vec);
+    // fvec_print (vec);
     n_frames += read;
   } while ( read == hop_size );

wscript

@@ -57 +57 @@
   add_option_enable_disable(ctx, 'sndfile', default = None,
           help_str = 'compile with sndfile (auto)', help_disable_str = 'disable sndfile')
-  add_option_enable_disable(ctx, 'avcodec', default = None,
-          help_str = 'compile with libavcodec (auto)', help_disable_str = 'disable libavcodec')
   add_option_enable_disable(ctx, 'samplerate', default = None,
           help_str = 'compile with samplerate (auto)', help_disable_str = 'disable samplerate')
@@ -202 +200 @@
     args = '--cflags --libs', uselib_store = 'LASH', mandatory = False)
 
-  if (ctx.options.enable_avcodec != False):
-    ctx.check_cfg(package = 'libavcodec', atleast_version = '54.35.0',
-    args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = False)
-    ctx.check_cfg(package = 'libavformat', atleast_version = '52.3.0',
-    args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = False)
-    ctx.check_cfg(package = 'libavutil', atleast_version = '52.3.0',
-    args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = False)
-    ctx.check_cfg(package = 'libavresample', atleast_version = '1.0.1',
-    args = '--cflags --libs', uselib_store = 'AVRESAMPLE', mandatory = False)
-
   # write configuration header
   ctx.write_config_header('src/config.h')