Changes in / [0969113:c9e3a4e]

Files:

• src/aubio_priv.h (modified) (1 diff)
• src/io/audio_unit.c (modified) (2 diffs)
• src/io/sink_sndfile.c (modified) (7 diffs)
• src/io/source_sndfile.c (modified) (1 diff)
• src/pitch/pitchyinfft.h (modified) (1 diff)
• src/spectral/mfcc.h (modified) (1 diff)
• wscript (modified) (3 diffs)

src/aubio_priv.h ¶

@@ -197 +197 @@
 #define DB2LIN(g) (POW(10.0,(g)*0.05f))
 #define LIN2DB(v) (20.0*LOG10(v))
-#define SQR(_a)   ((_a)*(_a))
-
-#ifndef MAX
-#define MAX(a,b)  (((a)>(b))?(a):(b))
-#endif /* MAX */
-#ifndef MIN
-#define MIN(a,b)  (((a)<(b))?(a):(b))
-#endif /* MIN */
+#define SQR(_a)   (_a*_a)
+
+#define MAX(a,b)  ( a > b ? a : b)
+#define MIN(a,b)  ( a < b ? a : b)
 
 #define ELEM_SWAP(a,b) { register smpl_t t=(a);(a)=(b);(b)=t; }

src/io/audio_unit.c ¶

@@ -20 +20 @@
 
 #include "config.h"
-#ifdef HAVE_AUDIO_UNIT
+#ifdef TARGET_OS_IPHONE
 #include "aubio_priv.h"
 
@@ -775 +775 @@
 }
 
-#endif /* HAVE_AUDIO_UNIT */
+#endif /* TARGET_OS_IPHONE */

src/io/sink_sndfile.c ¶

@@ -33 +33 @@
 #define MAX_CHANNELS 6
 #define MAX_SIZE 4096
-
-#if !HAVE_AUBIO_DOUBLE
-#define aubio_sf_write_smpl sf_write_float
-#else /* HAVE_AUBIO_DOUBLE */
-#define aubio_sf_write_smpl sf_write_double
-#endif /* HAVE_AUBIO_DOUBLE */
 
 struct _aubio_sink_sndfile_t {
@@ -132 +126 @@
     AUBIO_ERR("sink_sndfile: Failed opening %s. %s\n", s->path, sf_strerror (NULL));
     return AUBIO_FAIL;
-  }
+  }     
 
   s->scratch_size = s->max_size*s->channels;
@@ -141 +135 @@
     return AUBIO_FAIL;
   }
-  s->scratch_data = AUBIO_ARRAY(smpl_t,s->scratch_size);
+  s->scratch_data = AUBIO_ARRAY(float,s->scratch_size);
 
   return AUBIO_OK;
@@ -147 +141 @@
 
 void aubio_sink_sndfile_do(aubio_sink_sndfile_t *s, fvec_t * write_data, uint_t write){
-  uint_t i, j, channels = s->channels;
+  uint_t i, j,  channels = s->channels;
   int nsamples = 0;
   smpl_t *pwrite;
@@ -168 +162 @@
   }
 
-  written_frames = aubio_sf_write_smpl (s->handle, s->scratch_data, nsamples);
+  written_frames = sf_write_float (s->handle, s->scratch_data, nsamples);
   if (written_frames/channels != write) {
     AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written\n",
@@ -177 +171 @@
 
 void aubio_sink_sndfile_do_multi(aubio_sink_sndfile_t *s, fmat_t * write_data, uint_t write){
-  uint_t i, j, channels = s->channels;
+  uint_t i, j,  channels = s->channels;
   int nsamples = 0;
   smpl_t *pwrite;
@@ -198 +192 @@
   }
 
-  written_frames = aubio_sf_write_smpl (s->handle, s->scratch_data, nsamples);
+  written_frames = sf_write_float (s->handle, s->scratch_data, nsamples);
   if (written_frames/channels != write) {
     AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written\n",

src/io/source_sndfile.c ¶

@@ -91 +91 @@
     AUBIO_ERR("source_sndfile: Failed opening %s: %s\n", s->path, sf_strerror (NULL));
     goto beach;
-  }
+  }     
 
   /* get input specs */

src/pitch/pitchyinfft.h ¶

@@ -1 +1 @@
 /*
-  Copyright (C) 2003-2015 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2003-2013 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.

src/spectral/mfcc.h ¶

@@ -22 +22 @@
 /** \file
 
-  Mel-Frequency Cepstrum Coefficients object
-
-  This object computes MFCC coefficients on an input cvec_t.
-
-  The implementation follows the specifications established by Malcolm Slaney
-  in its Auditory Toolbox, available online (see file mfcc.m).
-
-  http://engineering.ecn.purdue.edu/~malcolm/interval/1998-010/
+  Mel-frequency cepstrum coefficients object
 
   \example spectral/test-mfcc.c

wscript ¶

@@ -79 +79 @@
             help_str = 'use Accelerate framework (darwin only) (auto)',
             help_disable_str = 'do not use Accelerate framework')
-    add_option_enable_disable(ctx, 'apple-audio', default = None,
-            help_str = 'use CoreFoundation (darwin only) (auto)',
-            help_disable_str = 'do not use CoreFoundation framework')
 
     ctx.add_option('--with-target-platform', type='string',
@@ -117 +114 @@
 
     if target_platform in [ 'darwin', 'ios', 'iosimulator']:
-        if (ctx.options.enable_apple_audio != False):
-            ctx.env.FRAMEWORK += ['CoreFoundation', 'AudioToolbox']
-            ctx.define('HAVE_SOURCE_APPLE_AUDIO', 1)
-            ctx.define('HAVE_SINK_APPLE_AUDIO', 1)
+        ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox']
+        ctx.define('HAVE_SOURCE_APPLE_AUDIO', 1)
+        ctx.define('HAVE_SINK_APPLE_AUDIO', 1)
         if (ctx.options.enable_accelerate != False):
             ctx.define('HAVE_ACCELERATE', 1)
@@ -126 +122 @@
 
     if target_platform in [ 'ios', 'iosimulator' ]:
+        ctx.define('TARGET_OS_IPHONE', 1)
         MINSDKVER="6.1"
         ctx.env.CFLAGS += ['-std=c99']
-        if (ctx.options.enable_audio_unit != False):
-            ctx.define('HAVE_AUDIO_UNIT', 1)
-            #ctx.env.FRAMEWORK += ['CoreFoundation', 'AudioToolbox']
         if target_platform == 'ios':
             DEVROOT = "/Applications/Xcode.app/Contents"