Changes in / [db120ac:54a2ca2]

Files:

• src/io/source.h (modified) (1 diff)
• src/io/source_apple_audio.c (modified) (5 diffs)
• tests/src/io/test-source_seek.c (deleted)

src/io/source.h

@@ -26 +26 @@
   Media source to read blocks of consecutive audio samples from file
 
-  To write to file, use ::aubio_sink_t.
-
   \example io/test-source.c
-  \example io/test-source_multi.c
 
 */

src/io/source_apple_audio.c

@@ -52 +52 @@
 extern CFURLRef getURLFromPath(const char * path);
 
-uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * path);
-
 aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * path, uint_t samplerate, uint_t block_size)
 {
   aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t);
 
+  s->path = path;
   s->block_size = block_size;
-  s->samplerate = samplerate;
-
-  if ( aubio_source_apple_audio_open ( s, path ) ) {
-    goto beach;
-  }
-  return s;
-
-beach:
-  AUBIO_FREE(s);
-  return NULL;
-}
-
-uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * path)
-{
+
   OSStatus err = noErr;
   UInt32 propSize;
-  s->path = path;
 
   // open the resource url
@@ -92 +77 @@
   if (err) { AUBIO_ERROR("error in ExtAudioFileGetProperty, %d\n", (int)err); goto beach;}
 
-  if (s->samplerate == 0) {
-    s->samplerate = fileFormat.mSampleRate;
+  if (samplerate == 0) {
+    samplerate = fileFormat.mSampleRate;
     //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
   }
-
+  s->samplerate = samplerate;
   s->source_samplerate = fileFormat.mSampleRate;
   s->channels = fileFormat.mChannelsPerFrame;
@@ -139 +124 @@
 
   // compute the size of the segments needed to read the input file
-  UInt32 samples = s->block_size * s->channels;
-  Float64 rateRatio = s->samplerate / s->source_samplerate;
+  UInt32 samples = s->block_size * clientFormat.mChannelsPerFrame;
+  Float64 rateRatio = clientFormat.mSampleRate / fileFormat.mSampleRate;
   uint_t segmentSize= (uint_t)(samples * rateRatio + .5);
   if (rateRatio < 1.) {
     segmentSize = (uint_t)(samples / rateRatio + .5);
   } else if (rateRatio > 1.) {
-    AUBIO_WRN("up-sampling %s from %0dHz to %0dHz\n", s->path, s->source_samplerate, s->samplerate);
+    AUBIO_WRN("up-sampling %s from %0.2fHz to %0.2fHz\n", s->path, fileFormat.mSampleRate, clientFormat.mSampleRate);
   } else {
     assert ( segmentSize == samples );
@@ -152 +137 @@
 
   // allocate the AudioBufferList
-  if (createAubioBufferList(&s->bufferList, s->channels, segmentSize)) {
-    AUBIO_ERR("source_apple_audio: failed creating bufferList\n");
-    goto beach;
-  }
-
+  if (createAubioBufferList(&s->bufferList, s->channels, segmentSize)) err = -1;
+
+  return s;
+ 
 beach:
-  return err;
+  AUBIO_FREE(s);
+  return NULL;
 }
 
@@ -220 +205 @@
 }
 
-uint_t aubio_source_apple_audio_close (aubio_source_apple_audio_t *s)
-{
+void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){
   OSStatus err = noErr;
-  if (!s || !s->audioFile) { return 1; }
+  if (!s || !s->audioFile) { return; }
   err = ExtAudioFileDispose(s->audioFile);
   if (err) AUBIO_ERROR("error in ExtAudioFileDispose, %d\n", (int)err);
   s->audioFile = NULL;
-  return err;
-}
-
-void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){
-  aubio_source_apple_audio_close (s);
   freeAudioBufferList(&s->bufferList);
   AUBIO_FREE(s);