Changeset 1223979 for src

Timestamp:

Jul 15, 2012, 8:02:27 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:

11a1abe

Parents:

32df658

Message:

src/io/sink_apple_audio.c: added apple_audio sink, merge apple stuff

Location:

src/io

Files:

• sink_apple_audio.c (added)
• sink_apple_audio.h (added)
• source_apple_audio.c (modified) (5 diffs)
• utils_apple_audio.c (added)

src/io/source_apple_audio.c

@@ -25 +25 @@
 #include "io/source_apple_audio.h"
 
-// CFURLRef, CFURLCreateWithFileSystemPath, ...
-#include <CoreFoundation/CoreFoundation.h>
 // ExtAudioFileRef, AudioStreamBasicDescription, AudioBufferList, ...
 #include <AudioToolbox/AudioToolbox.h>
@@ -45 +43 @@
 
   ExtAudioFileRef audioFile;
-  AudioStreamBasicDescription fileFormat;
   AudioBufferList bufferList;
 };
 
-static int createAubioBufferList(AudioBufferList *bufferList, int channels, int segmentSize);
-static void freeAudioBufferList(AudioBufferList *bufferList);
-static CFURLRef getURLFromPath(const char * path);
+extern int createAubioBufferList(AudioBufferList *bufferList, int channels, int segmentSize);
+extern void freeAudioBufferList(AudioBufferList *bufferList);
+extern CFURLRef getURLFromPath(const char * path);
 
 aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * path, uint_t samplerate, uint_t block_size)
@@ -96 +93 @@
   err = ExtAudioFileSetProperty(s->audioFile, kExtAudioFileProperty_ClientDataFormat,
       propSize, &clientFormat);
-  if (err) { fprintf(stderr, "error in ExtAudioFileSetProperty, %d\n", (int)err); goto beach;}
+  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);
@@ -113 +111 @@
   AUBIO_DBG("file/client Format.mBytesPerPacket   : %6d / %d\n",    (int)fileFormat.mBytesPerPacket  , (int)clientFormat.mBytesPerPacket);
   AUBIO_DBG("file/client Format.mReserved         : %6d / %d\n",    (int)fileFormat.mReserved        , (int)clientFormat.mReserved);
+#endif
 
   // compute the size of the segments needed to read the input file
@@ -166 +165 @@
 }
 
-static int createAubioBufferList(AudioBufferList * bufferList, int channels, int segmentSize) {
-  bufferList->mNumberBuffers = 1;
-  bufferList->mBuffers[0].mNumberChannels = channels;
-  bufferList->mBuffers[0].mData = (short *)malloc(segmentSize * sizeof(short));
-  bufferList->mBuffers[0].mDataByteSize = segmentSize * sizeof(short);
-  return 0;
-}
-
-static void freeAudioBufferList(AudioBufferList *bufferList) {
-  UInt32 i = 0;
-  if (!bufferList) return;
-  for (i = 0; i < bufferList->mNumberBuffers; i++) {
-    if (bufferList->mBuffers[i].mData) {
-      free (bufferList->mBuffers[i].mData);
-      bufferList->mBuffers[i].mData = NULL;
-    }
-  }
-  bufferList = NULL;
-}
-
-static CFURLRef getURLFromPath(const char * path) {
-  CFStringRef cfTotalPath = CFStringCreateWithCString (kCFAllocatorDefault,
-      path, kCFStringEncodingUTF8);
-
-  return CFURLCreateWithFileSystemPath(kCFAllocatorDefault, cfTotalPath,
-      kCFURLPOSIXPathStyle, false);
-}
-
-
 void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){
   OSStatus err = noErr;