Changes in src/io/source_apple_audio.c [4865e4b:8c43bf7]

File:

• src/io/source_apple_audio.c (modified) (10 diffs)

src/io/source_apple_audio.c

@@ -23 +23 @@
 #include "aubio_priv.h"
 #include "fvec.h"
-#include "fmat.h"
 #include "io/source_apple_audio.h"
 
@@ -38 +37 @@
 struct _aubio_source_apple_audio_t {
   uint_t channels;
-  uint_t samplerate;          //< requested samplerate
-  uint_t source_samplerate;   //< actual source samplerate
+  uint_t samplerate;
   uint_t block_size;
 
@@ -58 +56 @@
   s->path = path;
   s->block_size = block_size;
+  s->channels = 1;
 
   OSStatus err = noErr;
@@ -82 +81 @@
   }
   s->samplerate = samplerate;
-  s->source_samplerate = fileFormat.mSampleRate;
-  s->channels = fileFormat.mChannelsPerFrame;
 
   AudioStreamBasicDescription clientFormat;
@@ -101 +98 @@
   err = ExtAudioFileSetProperty(s->audioFile, kExtAudioFileProperty_ClientDataFormat,
       propSize, &clientFormat);
-  if (err) {
-      AUBIO_ERROR("error in ExtAudioFileSetProperty, %d\n", (int)err);
-#if 1
+  if (err) { AUBIO_ERROR("error in ExtAudioFileSetProperty, %d\n", (int)err); goto beach;}
+
+#if 0
   // print client and format descriptions
   AUBIO_DBG("Opened %s\n", s->path);
@@ -120 +117 @@
   AUBIO_DBG("file/client Format.mReserved         : %6d / %d\n",    (int)fileFormat.mReserved        , (int)clientFormat.mReserved);
 #endif
-      goto beach;
-  }
 
   // compute the size of the segments needed to read the input file
@@ -132 +127 @@
     AUBIO_WRN("up-sampling %s from %0.2fHz to %0.2fHz\n", s->path, fileFormat.mSampleRate, clientFormat.mSampleRate);
   } else {
-    assert ( segmentSize == samples );
+    assert (segmentSize == samples );
     //AUBIO_DBG("not resampling, segmentSize %d, block_size %d\n", segmentSize, s->block_size);
   }
@@ -149 +144 @@
   UInt32 c, v, loadedPackets = s->block_size;
   OSStatus err = ExtAudioFileRead(s->audioFile, &loadedPackets, &s->bufferList);
-  if (err) { AUBIO_ERROR("error in ExtAudioFileRead %s %d\n", s->path, (int)err); goto beach;}
+  if (err) { AUBIO_ERROR("error in ExtAudioFileRead, %d\n", (int)err); goto beach;}
 
   short *data = (short*)s->bufferList.mBuffers[0].mData;
@@ -176 +171 @@
 }
 
-void aubio_source_apple_audio_do_multi(aubio_source_apple_audio_t *s, fmat_t * read_to, uint_t * read) {
-  UInt32 c, v, loadedPackets = s->block_size;
-  OSStatus err = ExtAudioFileRead(s->audioFile, &loadedPackets, &s->bufferList);
-  if (err) { AUBIO_ERROR("source_apple_audio: error in ExtAudioFileRead, %d\n", (int)err); goto beach;}
-
-  short *data = (short*)s->bufferList.mBuffers[0].mData;
-
-  smpl_t **buf = read_to->data;
-
-  for (v = 0; v < loadedPackets; v++) {
-    for (c = 0; c < s->channels; c++) {
-      buf[c][v] = SHORT_TO_FLOAT(data[ v * s->channels + c]);
-    }
-  }
-  // short read, fill with zeros
-  if (loadedPackets < s->block_size) {
-    for (v = loadedPackets; v < s->block_size; v++) {
-      for (c = 0; c < s->channels; c++) {
-        buf[c][v] = 0.;
-      }
-    }
-  }
-  *read = (uint_t)loadedPackets;
-  return;
-beach:
-  *read = 0;
-  return;
-}
-
 void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){
   OSStatus err = noErr;
@@ -216 +182 @@
 }
 
-uint_t aubio_source_apple_audio_seek (aubio_source_apple_audio_t * s, uint_t pos) {
-  SInt64 resampled_pos = (SInt64)ROUND( pos * s->source_samplerate * 1. / s->samplerate );
-  OSStatus err = ExtAudioFileSeek(s->audioFile, resampled_pos);
-  if (err) AUBIO_ERROR("source_apple_audio: error in ExtAudioFileSeek (%d)\n", (int)err);
-  return err;
-}
-
 uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s) {
   return s->samplerate;
 }
 
-uint_t aubio_source_apple_audio_get_channels(aubio_source_apple_audio_t * s) {
-  return s->channels;
-}
-
 #endif /* __APPLE__ */