Changeset 3504dfe7

Timestamp:

Jul 13, 2012, 11:28:43 PM (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:

a40eea8

Parents:

4d75b46

Message:

src/io/source_apple_audio.{c,h}: added simple file read using ExtAudioFile?

Location:

src/io

Files:

• source.c (modified) (1 diff)
• source.h (modified) (1 diff)
• source_apple_audio.c (added)
• source_apple_audio.h (added)

src/io/source.c

@@ -23 +23 @@
 #include "fvec.h"
 #include "io/source.h"
+#ifdef __APPLE__
+#include "io/source_apple_audio_file.h"
+#endif /* __APPLE__ */
 
 struct _aubio_source_t { 
-  uint_t hopsize;
-  uint_t samplerate;
+  void *source;
 };
 
 aubio_source_t * new_aubio_source(char_t * uri, uint_t hop_size, uint_t samplerate) {
-  return NULL;
+  aubio_source_t * s = AUBIO_NEW(aubio_source_t);
+#ifdef __APPLE__
+  s->source= (void *)new_aubio_source_apple_audio(uri, hop_size, samplerate);
+#endif /* __APPLE__ */
+  if (s->source == NULL) return NULL;
+  return s;
 }
 
-fvec_t * aubio_source_do(aubio_source_t * s, fvec_t * write_data) {
-  return NULL;
+void aubio_source_do(aubio_source_t * s, fvec_t * data, uint_t * read) {
+#ifdef __APPLE__
+  aubio_source_apple_audio_do((aubio_source_apple_audio_t *)s->source, data, read);
+#endif /* __APPLE__ */
 }
 
 void del_aubio_source(aubio_source_t * s) {
-  return;
+#ifdef __APPLE__
+  del_aubio_source_apple_audio((aubio_source_apple_audio_t *)s->source);
+#endif /* __APPLE__ */
+  AUBIO_FREE(s);
 }
 

src/io/source.h

@@ -33 +33 @@
 
 typedef struct _aubio_source_t aubio_source_t;
-aubio_source_t * new_aubio_source(char_t * uri, uint_t hop_size, uint_t samplerate);
-fvec_t * aubio_source_do(aubio_source_t * s);
+aubio_source_t * new_aubio_source(char_t * method, uint_t hop_size, uint_t samplerate);
+void aubio_source_do(aubio_source_t * s, fvec_t * read_data, uint_t * read);
 void del_aubio_source(aubio_source_t * s);