Changeset b257b60 for src

Timestamp:

Aug 12, 2015, 7:21:38 PM (10 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:

60fc05b

Parents:

3a1a5d6 (diff), 7b2d740 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'develop' into notes

Location:

src

Files:

• aubio_priv.h (modified) (2 diffs)
• io/audio_unit.c (modified) (1 diff)
• io/sink_apple_audio.c (modified) (1 diff)
• io/sink_sndfile.c (modified) (4 diffs)
• io/sink_wavwrite.c (modified) (2 diffs)
• io/source_sndfile.c (modified) (7 diffs)
• io/source_wavread.c (modified) (3 diffs)
• mathutils.c (modified) (1 diff)
• musicutils.h (modified) (1 diff)
• onset/onset.c (modified) (4 diffs)
• onset/onset.h (modified) (1 diff)
• pitch/pitch.c (modified) (4 diffs)
• pitch/pitchyin.c (modified) (1 diff)
• pitch/pitchyinfft.c (modified) (1 diff)
• spectral/phasevoc.c (modified) (1 diff)
• spectral/specdesc.c (modified) (1 diff)
• spectral/specdesc.h (modified) (1 diff)
• synth/sampler.c (modified) (2 diffs)
• tempo/beattracking.c (modified) (2 diffs)
• tempo/tempo.c (modified) (5 diffs)
• tempo/tempo.h (modified) (2 diffs)
• temporal/resampler.c (modified) (1 diff)
• wscript_build (modified) (2 diffs)

src/aubio_priv.h ¶

@@ -129 +129 @@
 #define AUBIO_SPRINTF                sprintf
 
-/* Libc shortcuts */
+/* pi and 2*pi */
+#ifndef M_PI
+#define PI         (3.14159265358979323846)
+#else
 #define PI         (M_PI)
+#endif
 #define TWO_PI     (PI*2.)
 
@@ -214 +218 @@
 #define SAFE_LOG(f)   LOG(CEIL_DENORMAL(f))
 
+/** silence unused parameter warning by adding an attribute */
+#if defined(__GNUC__)
 #define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
 
 #endif /* _AUBIO__PRIV_H */

src/io/audio_unit.c ¶

@@ -234 +234 @@
   audioFormat.mChannelsPerFrame = 2;
   audioFormat.mFormatID = kAudioFormatLinearPCM;
-  audioFormat.mFormatFlags = kAudioFormatFlagsCanonical;
+  audioFormat.mFormatFlags = kAudioFormatFlagIsSignedInteger | kAudioFormatFlagsNativeEndian | kAudioFormatFlagIsPacked;
   audioFormat.mFramesPerPacket = 1;
-  audioFormat.mBitsPerChannel = 8 * sizeof(AudioSampleType);
+  audioFormat.mBitsPerChannel = 8 * sizeof(SInt16);
 #if 1  // interleaving
-  audioFormat.mBytesPerFrame = 2 * sizeof(AudioSampleType);
-  audioFormat.mBytesPerPacket = 2 * sizeof(AudioSampleType);
+  audioFormat.mBytesPerFrame = 2 * sizeof(SInt16);
+  audioFormat.mBytesPerPacket = 2 * sizeof(SInt16);
 #else
-  audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame = sizeof(AudioUnitSampleType);
+  audioFormat.mBytesPerPacket = audioFormat.mBytesPerFrame = sizeof(SInt32);
   audioFormat.mFormatFlags |= kAudioFormatFlagIsNonInterleaved;
 #endif

src/io/sink_apple_audio.c ¶

@@ -61 +61 @@
   s->max_frames = MAX_SIZE;
   s->async = true;
+
+  if (uri == NULL) {
+    AUBIO_ERROR("sink_apple_audio: Aborted opening null path\n");
+    goto beach;
+  }
 
   s->samplerate = 0;

src/io/sink_sndfile.c ¶

@@ -142 +142 @@
 void aubio_sink_sndfile_do(aubio_sink_sndfile_t *s, fvec_t * write_data, uint_t write){
   uint_t i, j,  channels = s->channels;
-  int nsamples = channels*write;
+  int nsamples = 0;
   smpl_t *pwrite;
   sf_count_t written_frames;
 
   if (write > s->max_size) {
-    AUBIO_WRN("trying to write %d frames, but only %d can be written at a time",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames, but only %d can be written at a time\n",
       write, s->max_size);
     write = s->max_size;
   }
+
+  nsamples = channels * write;
 
   /* interleaving data  */
@@ -162 +164 @@
   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",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written\n",
       write, s->path, (uint_t)written_frames);
   }
@@ -170 +172 @@
 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;
-  int nsamples = channels*write;
+  int nsamples = 0;
   smpl_t *pwrite;
   sf_count_t written_frames;
 
   if (write > s->max_size) {
-    AUBIO_WRN("trying to write %d frames, but only %d can be written at a time",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames, but only %d can be written at a time\n",
       write, s->max_size);
     write = s->max_size;
   }
+
+  nsamples = channels * write;
 
   /* interleaving data  */
@@ -190 +194 @@
   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",
+    AUBIO_WRN("sink_sndfile: trying to write %d frames to %s, but only %d could be written\n",
       write, s->path, (uint_t)written_frames);
   }

src/io/sink_wavwrite.c ¶

@@ -45 +45 @@
 #define HTOLES(x) x
 #else
+#ifdef HAVE_WIN_HACKS
+#define HTOLES(x) x
+#else
 #define HTOLES(x) SWAPS(htons(x))
+#endif
 #endif
 
@@ -98 +102 @@
   // zero samplerate given. do not open yet
   if ((sint_t)samplerate == 0) return s;
+  // samplerate way too large, fail
+  if ((sint_t)samplerate > 192000 * 4) goto beach;
 
   s->samplerate = samplerate;

src/io/source_sndfile.c ¶

@@ -152 +152 @@
 void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_data, uint_t * read){
   uint_t i,j, input_channels = s->input_channels;
-  /* do actual reading */
+  /* read from file into scratch_data */
   sf_count_t read_samples = sf_read_float (s->handle, s->scratch_data, s->scratch_size);
 
-  smpl_t *data;
-
+  /* where to store de-interleaved data */
+  smpl_t *ptr_data;
 #ifdef HAVE_SAMPLERATE
   if (s->ratio != 1) {
-    data = s->input_data->data;
+    ptr_data = s->input_data->data;
   } else
 #endif /* HAVE_SAMPLERATE */
   {
-    data = read_data->data;
+    ptr_data = read_data->data;
   }
 
   /* de-interleaving and down-mixing data  */
   for (j = 0; j < read_samples / input_channels; j++) {
-    data[j] = 0;
+    ptr_data[j] = 0;
     for (i = 0; i < input_channels; i++) {
-      data[j] += s->scratch_data[input_channels*j+i];
-    }
-    data[j] /= (smpl_t)input_channels;
+      ptr_data[j] += s->scratch_data[input_channels*j+i];
+    }
+    ptr_data[j] /= (smpl_t)input_channels;
   }
 
@@ -196 +196 @@
   sf_count_t read_samples = sf_read_float (s->handle, s->scratch_data, s->scratch_size);
 
-  smpl_t **data;
-
+  /* where to store de-interleaved data */
+  smpl_t **ptr_data;
 #ifdef HAVE_SAMPLERATE
   if (s->ratio != 1) {
-    AUBIO_ERR("source_sndfile: no multi channel resampling yet");
+    AUBIO_ERR("source_sndfile: no multi channel resampling yet\n");
     return;
-    //data = s->input_data->data;
+    //ptr_data = s->input_data->data;
   } else
 #endif /* HAVE_SAMPLERATE */
   {
-    data = read_data->data;
+    ptr_data = read_data->data;
   }
 
@@ -214 +214 @@
     for (j = 0; j < read_samples / input_channels; j++) {
       for (i = 0; i < read_data->height; i++) {
-        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
+        ptr_data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
       }
     }
@@ -222 +222 @@
     for (j = 0; j < read_samples / input_channels; j++) {
       for (i = 0; i < input_channels; i++) {
-        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
+        ptr_data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
       }
     }
@@ -232 +232 @@
     for (j = 0; j < read_samples / input_channels; j++) {
       for (i = input_channels; i < read_data->height; i++) {
-        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + (input_channels - 1)];
+        ptr_data[i][j] = (smpl_t)s->scratch_data[j * input_channels + (input_channels - 1)];
       }
     }
@@ -265 +265 @@
 uint_t aubio_source_sndfile_seek (aubio_source_sndfile_t * s, uint_t pos) {
   uint_t resampled_pos = (uint_t)ROUND(pos / s->ratio);
-  return sf_seek (s->handle, resampled_pos, SEEK_SET);
+  sf_count_t sf_ret = sf_seek (s->handle, resampled_pos, SEEK_SET);
+  if (sf_ret == -1) {
+    AUBIO_ERR("source_sndfile: Failed seeking %s at %d: %s\n", s->path, pos, sf_strerror (NULL));
+    return AUBIO_FAIL;
+  }
+  if (sf_ret != resampled_pos) {
+    AUBIO_ERR("source_sndfile: Tried seeking %s at %d, but got %d: %s\n",
+        s->path, resampled_pos, (uint_t)sf_ret, sf_strerror (NULL));
+    return AUBIO_FAIL;
+  }
+  return AUBIO_OK;
 }
 
@@ -273 +283 @@
   }
   if(sf_close(s->handle)) {
-    AUBIO_ERR("source_sndfile: Error closing file %s: %s", s->path, sf_strerror (NULL));
+    AUBIO_ERR("source_sndfile: Error closing file %s: %s\n", s->path, sf_strerror (NULL));
     return AUBIO_FAIL;
   }

src/io/source_wavread.c ¶

@@ -93 +93 @@
   s->fid = fopen((const char *)path, "rb");
   if (!s->fid) {
-    AUBIO_ERR("source_wavread: could not open %s (%s)\n", s->path, strerror(errno));
+    AUBIO_ERR("source_wavread: Failed opening %s (System error: %s)\n", s->path, strerror(errno));
     goto beach;
   }
@@ -220 +220 @@
 #ifndef HAVE_WIN_HACKS
     AUBIO_ERR("source_wavread: short read (%zd instead of %zd) in %s\n",
+        bytes_read, bytes_expected, s->path);
 #else // mingw does not know about %zd...
     AUBIO_ERR("source_wavread: short read (%d instead of %d) in %s\n",
+        (int)bytes_read, (int)bytes_expected, s->path);
 #endif
-        bytes_read, bytes_expected, s->path);
     goto beach;
   }
@@ -356 +357 @@
 
 uint_t aubio_source_wavread_seek (aubio_source_wavread_t * s, uint_t pos) {
-  uint_t ret = fseek(s->fid, s->seek_start + pos * s->blockalign, SEEK_SET);
+  uint_t ret = 0;
+  if ((sint_t)pos < 0) {
+    return AUBIO_FAIL;
+  }
+  ret = fseek(s->fid, s->seek_start + pos * s->blockalign, SEEK_SET);
+  if (ret != 0) {
+    AUBIO_ERR("source_wavread: could not seek %s at %d (%s)\n", s->path, pos, strerror(errno));
+    return AUBIO_FAIL;
+  }
+  // reset some values
   s->eof = 0;
   s->read_index = 0;
-  return ret;
+  return AUBIO_OK;
 }
 

src/mathutils.c ¶

@@ -141 +141 @@
     case aubio_win_parzen:
       for (i=0;i<size;i++)
-        w[i] = 1.0 - ABS((2.*i-size)/(size+1.0));
+        w[i] = 1.0 - ABS((2.f*i-size)/(size+1.0f));
       break;
     default:

src/musicutils.h ¶

@@ -113 +113 @@
 smpl_t aubio_zero_crossing_rate (fvec_t * v);
 
-/** compute sound level on a linear
+/** compute sound level on a linear scale
 
   This gives the average of the square amplitudes.
 
-  \param v vector to compute dB SPL from
+  \param v vector to compute level from
 
   \return level of v

src/onset/onset.c ¶

@@ -69 +69 @@
   } else {
     // we are at the beginning of the file, and we don't find silence
-    if (o->total_frames == 0 && aubio_silence_detection(input, o->silence) == 0) {
+    if (o->total_frames <= o->delay && o->last_onset < o ->minioi && aubio_silence_detection(input, o->silence) == 0) {
       //AUBIO_DBG ("beginning of file is not silent, marking as onset\n");
       isonset = o->delay / o->hop_size;
@@ -100 +100 @@
 }
 
+smpl_t aubio_onset_get_silence(aubio_onset_t * o) {
+  return o->silence;
+}
+
 uint_t aubio_onset_set_threshold(aubio_onset_t * o, smpl_t threshold) {
   aubio_peakpicker_set_threshold(o->pp, threshold);
@@ -173 +177 @@
 {
   aubio_onset_t * o = AUBIO_NEW(aubio_onset_t);
+
+  /* check parameters are valid */
+  if ((sint_t)hop_size < 1) {
+    AUBIO_ERR("onset: got hop_size %d, but can not be < 1\n", hop_size);
+    goto beach;
+  } else if ((sint_t)buf_size < 1) {
+    AUBIO_ERR("onset: got buffer_size %d, but can not be < 1\n", buf_size);
+    goto beach;
+  } else if (buf_size < hop_size) {
+    AUBIO_ERR("onset: hop size (%d) is larger than win size (%d)\n", buf_size, hop_size);
+    goto beach;
+  } else if ((sint_t)samplerate < 1) {
+    AUBIO_ERR("onset: samplerate (%d) can not be < 1\n", samplerate);
+    goto beach;
+  }
+
   /* store creation parameters */
   o->samplerate = samplerate;
@@ -194 +214 @@
   o->total_frames = 0;
   return o;
+
+beach:
+  AUBIO_FREE(o);
+  return NULL;
 }
 

src/onset/onset.h ¶

@@ -126 +126 @@
 uint_t aubio_onset_set_silence(aubio_onset_t * o, smpl_t silence);
 
+/** get onset detection silence threshold
+
+  \param o onset detection object as returned by new_aubio_onset()
+
+  \return current silence threshold
+
+*/
+smpl_t aubio_onset_get_silence(aubio_onset_t * o);
+
 /** get onset detection function
 

src/pitch/pitch.c ¶

@@ -130 +130 @@
     pitch_type = aubio_pitcht_default;
   }
+
+  // check parameters are valid
+  if ((sint_t)hopsize < 1) {
+    AUBIO_ERR("onset: got hopsize %d, but can not be < 1\n", hopsize);
+    goto beach;
+  } else if ((sint_t)bufsize < 1) {
+    AUBIO_ERR("onset: got buffer_size %d, but can not be < 1\n", bufsize);
+    goto beach;
+  } else if (bufsize < hopsize) {
+    AUBIO_ERR("onset: hop size (%d) is larger than win size (%d)\n", bufsize, hopsize);
+    goto beach;
+  } else if ((sint_t)samplerate < 1) {
+    AUBIO_ERR("onset: samplerate (%d) can not be < 1\n", samplerate);
+    goto beach;
+  }
+
   p->samplerate = samplerate;
   p->type = pitch_type;
@@ -179 +195 @@
   }
   return p;
+
+beach:
+  AUBIO_FREE(p);
+  return NULL;
 }
 
@@ -238 +258 @@
     pitch_mode = aubio_pitchm_freq;
   else if (strcmp (pitch_unit, "hertz") == 0)
+    pitch_mode = aubio_pitchm_freq;
+  else if (strcmp (pitch_unit, "Hertz") == 0)
     pitch_mode = aubio_pitchm_freq;
   else if (strcmp (pitch_unit, "Hz") == 0)
@@ -296 +318 @@
 aubio_pitch_set_silence (aubio_pitch_t * p, smpl_t silence)
 {
-  if (silence < 0 && silence > -200) {
+  if (silence <= 0 && silence >= -200) {
     p->silence = silence;
     return AUBIO_OK;
   } else {
-    AUBIO_ERR("pitch: could do set silence to %.2f", silence);
+    AUBIO_ERR("pitch: could not set silence to %.2f", silence);
     return AUBIO_FAIL;
   }

src/pitch/pitchyin.c ¶

@@ -146 +146 @@
     }
     tmp2 += yin->data[tau];
-    yin->data[tau] *= tau / tmp2;
+    if (tmp2 != 0) {
+      yin->data[tau] *= tau / tmp2;
+    } else {
+      yin->data[tau] = 1.;
+    }
     period = tau - 3;
     if (tau > 4 && (yin->data[period] < tol) &&

src/pitch/pitchyinfft.c ¶

@@ -136 +136 @@
     // and the cumulative mean normalized difference function
     tmp += yin->data[tau];
-    yin->data[tau] *= tau / tmp;
+    if (tmp != 0) {
+      yin->data[tau] *= tau / tmp;
+    } else {
+      yin->data[tau] = 1.;
+    }
   }
   // find best candidates

src/spectral/phasevoc.c ¶

@@ -78 +78 @@
 
   if ((sint_t)hop_s < 1) {
-    AUBIO_ERR("got hop_size %d, but can not be < 1\n", hop_s);
+    AUBIO_ERR("pvoc: got hop_size %d, but can not be < 1\n", hop_s);
     goto beach;
   } else if ((sint_t)win_s < 1) {
-    AUBIO_ERR("got buffer_size %d, but can not be < 1\n", win_s);
+    AUBIO_ERR("pvoc: got buffer_size %d, but can not be < 1\n", win_s);
     goto beach;
   } else if (win_s < hop_s) {
-    AUBIO_ERR("hop size (%d) is larger than win size (%d)\n", win_s, hop_s);
+    AUBIO_ERR("pvoc: hop size (%d) is larger than win size (%d)\n", win_s, hop_s);
     goto beach;
   }

src/spectral/specdesc.c ¶

@@ -119 +119 @@
     onset->data[0] +=
       SQRT (ABS (SQR (o->oldmag->data[j]) + SQR (fftgrain->norm[j])
-            - 2. * o->oldmag->data[j] * fftgrain->norm[j]
+            - 2 * o->oldmag->data[j] * fftgrain->norm[j]
             * COS (o->dev1->data[j] - fftgrain->phas[j])));
     /* swap old phase data (need to remember 2 frames behind)*/

src/spectral/specdesc.h ¶

@@ -158 +158 @@
 /** execute spectral description function on a spectral frame
 
-  Generic function to compute spectral detescription.
+  Generic function to compute spectral description.
 
   \param o spectral description object as returned by new_aubio_specdesc()

src/synth/sampler.c ¶

@@ -40 +40 @@
 {
   aubio_sampler_t *s = AUBIO_NEW(aubio_sampler_t);
+  if ((sint_t)blocksize < 1) {
+    AUBIO_ERR("sampler: got blocksize %d, but can not be < 1\n", blocksize);
+    goto beach;
+  }
   s->samplerate = samplerate;
   s->blocksize = blocksize;
@@ -47 +51 @@
   s->playing = 0;
   return s;
+beach:
+  AUBIO_FREE(s);
+  return NULL;
 }
 

src/tempo/beattracking.c ¶

@@ -267 +267 @@
   sint_t k = 0;
   smpl_t three_energy = 0., four_energy = 0.;
+  if (gp < 2) return 4;
   if (acflen > 6 * gp + 2) {
     for (k = -2; k < 2; k++) {
@@ -331 +332 @@
   if (counter == 1 && flagstep == 1) {
     //check for consistency between previous beatperiod values
-    if (ABS (2. * rp - rp1 - rp2) < bt->g_var) {
+    if (ABS (2 * rp - rp1 - rp2) < bt->g_var) {
       //if true, can activate context dependent model
       flagconst = 1;

src/tempo/tempo.c ¶

@@ -110 +110 @@
       tempo->data[0] = o->out->data[i] - FLOOR(o->out->data[i]); /* set tactus */
       /* test for silence */
-      /*
       if (aubio_silence_detection(input, o->silence)==1) {
         tempo->data[0] = 0; // unset beat if silent
       }
-      */
       o->last_beat = o->total_frames + (uint_t)ROUND(tempo->data[0] * o->hop_size);
     }
@@ -149 +147 @@
   o->silence = silence;
   return AUBIO_OK;
+}
+
+smpl_t aubio_tempo_get_silence(aubio_tempo_t * o) {
+  return o->silence;
 }
 
@@ -157 +159 @@
 }
 
+smpl_t aubio_tempo_get_threshold(aubio_tempo_t * o) {
+  return o->threshold;
+}
+
 /* Allocate memory for an tempo detection */
 aubio_tempo_t * new_aubio_tempo (char_t * tempo_mode,
@@ -164 +170 @@
   char_t specdesc_func[20];
   o->samplerate = samplerate;
+  // check parameters are valid
+  if ((sint_t)hop_size < 1) {
+    AUBIO_ERR("tempo: got hop size %d, but can not be < 1\n", hop_size);
+    goto beach;
+  } else if ((sint_t)buf_size < 1) {
+    AUBIO_ERR("tempo: got window size %d, but can not be < 1\n", buf_size);
+    goto beach;
+  } else if (buf_size < hop_size) {
+    AUBIO_ERR("tempo: hop size (%d) is larger than window size (%d)\n", buf_size, hop_size);
+    goto beach;
+  } else if ((sint_t)samplerate < 1) {
+    AUBIO_ERR("tempo: samplerate (%d) can not be < 1\n", samplerate);
+    goto beach;
+  }
+
   /* length of observations, worth about 6 seconds */
   o->winlen = aubio_next_power_of_two(5.8 * samplerate / hop_size);
+  if (o->winlen < 4) o->winlen = 4;
   o->step = o->winlen/4;
   o->blockpos = 0;
@@ -194 +216 @@
   }*/
   return o;
+
+beach:
+  AUBIO_FREE(o);
+  return NULL;
 }
 

src/tempo/tempo.h ¶

@@ -94 +94 @@
 uint_t aubio_tempo_set_silence(aubio_tempo_t * o, smpl_t silence);
 
+/** get tempo detection silence threshold
+
+  \param o tempo detection object as returned by new_aubio_tempo()
+
+  \return current silence threshold
+
+*/
+smpl_t aubio_tempo_get_silence(aubio_tempo_t * o);
+
 /** set tempo detection peak picking threshold
 
@@ -103 +112 @@
 */
 uint_t aubio_tempo_set_threshold(aubio_tempo_t * o, smpl_t threshold);
+
+/** get tempo peak picking threshold
+
+  \param o tempo detection object as returned by new_aubio_tempo()
+
+  \return current tempo detection threshold
+
+*/
+smpl_t aubio_tempo_get_threshold(aubio_tempo_t * o);
 
 /** get current tempo

src/temporal/resampler.c ¶

@@ -77 +77 @@
 struct _aubio_resampler_t
 {
+  void *dummy;
 };
 

src/wscript_build ¶

@@ -21 +21 @@
 # build libaubio.so (cshlib) and/or libaubio.a (cstlib)
 if ctx.env['DEST_OS'] in ['ios', 'iosimulator']:
-    build_features = ['cstlib']
+    build_features = ['cstlib', 'cshlib']
 elif ctx.env['DEST_OS'] in ['win32', 'win64']:
     build_features = ['cshlib']
@@ -30 +30 @@
     ctx(features = 'c ' + target,
             use = ['lib_objects'],
+            uselib = uselib,
             lib = 'm',
             target = 'aubio',
-            install_path = '${PREFIX}/lib',
             vnum = ctx.env['LIB_VERSION'])