Changeset afbd7e7

Timestamp:

Jul 14, 2012, 1:33:45 AM (12 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:

9b1e101

Parents:

4722e63

Message:

src/io/source_sndfile.{c,h}: added sndfile source

Files:

• src/aubio.h (modified) (1 diff)
• src/io/source.c (modified) (4 diffs)
• src/io/source_sndfile.c (added)
• src/io/source_sndfile.h (added)
• src/wscript_build (modified) (1 diff)
• tests/src/io/test-source_apple_audio_file.c (modified) (1 diff)
• tests/src/io/test-source_sndfile.c (added)

src/aubio.h

@@ -175 +175 @@
 #include "onset/peakpicker.h"
 #include "tempo/tempo.h"
+#include "io/sndfileio.h"
 #include "io/source.h"
+#include "io/source_sndfile.h"
+#include "io/source_apple_audio.h"
 #include "io/sink.h"
-#include "io/source_apple_audio.h"
 
 #if AUBIO_UNSTABLE

src/io/source.c

@@ -26 +26 @@
 #include "io/source_apple_audio_file.h"
 #endif /* __APPLE__ */
+#ifdef HAVE_SNDFILE
+#include "io/source_sndfile.h"
+#endif
 
 struct _aubio_source_t { 
@@ -31 +34 @@
 };
 
-aubio_source_t * new_aubio_source(char_t * uri, uint_t hop_size, uint_t samplerate) {
+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);
 #ifdef __APPLE__
-  s->source= (void *)new_aubio_source_apple_audio(uri, hop_size, samplerate);
+  s->source= (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);
+  if (s->source) return s;
+#else /* __APPLE__ */
+#if HAVE_SNDFILE
+  s->source= (void *)new_aubio_source_sndfile(uri, samplerate, hop_size);
+  if (s->source) return s;
+#endif /* HAVE_SNDFILE */
 #endif /* __APPLE__ */
   if (s->source == NULL) return NULL;
-  return s;
 }
 
@@ -43 +51 @@
 #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__ */
 }
@@ -49 +61 @@
 #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);

src/wscript_build

@@ -10 +10 @@
 if 'HAVE_SAMPLERATE':
   uselib += ['SAMPLERATE']
+
+if 'HAVE_SNDFILE':
+  uselib += ['SNDFILE']
 
 # build libaubio

tests/src/io/test-source_apple_audio_file.c

@@ -22 +22 @@
   del_aubio_source_apple_audio(s);
 #else
-  fprintf(stderr, "was not compiled with aubio_source_apple_audio");
+  fprintf(stderr, "ERR: aubio was not compiled with aubio_source_apple_audio\n");
 #endif /* __APPLE__ */
   return 0;