Changeset 057ecee


Ignore:
Timestamp:
Jan 8, 2019, 7:21:22 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/crepe_org
Children:
977a5c3
Parents:
ba740ea (diff), 65a4fb4 (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 'master' into feature/crepe

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    rba740ea r057ecee  
    99      os: linux
    1010      compiler: gcc
     11      env: WAFOPTS="--build-type=debug"
    1112    - python: 2.7
    1213      os: linux
  • src/aubio_priv.h

    rba740ea r057ecee  
    7575#endif
    7676
    77 #if defined(HAVE_ACCELERATE)
    78 #define HAVE_ATLAS 1
    79 #define HAVE_BLAS 1
    80 #include <Accelerate/Accelerate.h>
    81 #elif defined(HAVE_ATLAS_CBLAS_H)
    82 #elif defined(HAVE_BLAS)
     77#if defined(HAVE_BLAS) // --enable-blas=true
     78// check which cblas header we found
    8379#if defined(HAVE_ATLAS_CBLAS_H)
    8480#define HAVE_ATLAS 1
     
    8884#elif defined(HAVE_CBLAS_H)
    8985#include <cblas.h>
    90 #endif
    91 #endif
    92 
    93 #ifdef HAVE_ACCELERATE
     86#elif !defined(HAVE_ACCELERATE)
     87#error "HAVE_BLAS was defined, but no blas header was found"
     88#endif /* end of cblas includes */
     89#endif
     90
     91#if defined(HAVE_ACCELERATE)
     92// include accelerate framework after blas
     93#define HAVE_ATLAS 1
     94#define HAVE_BLAS 1
    9495#include <Accelerate/Accelerate.h>
     96
    9597#ifndef HAVE_AUBIO_DOUBLE
    9698#define aubio_vDSP_mmov       vDSP_mmov
  • src/io/sink.c

    rba740ea r057ecee  
    136136
    137137void del_aubio_sink(aubio_sink_t * s) {
    138   AUBIO_ASSERT(s);
     138  //AUBIO_ASSERT(s);
    139139  if (s && s->s_del && s->sink)
    140140    s->s_del((void *)s->sink);
  • src/io/sink_wavwrite.c

    rba740ea r057ecee  
    212212
    213213  // fwrite(*, *, 1, s->fid) was called 13 times, check success
    214   if (written != 13) {
    215     AUBIO_STRERR("sink_wavwrite: writing header to %s failed, expected %d"
    216         " write but got only %d (%s)\n", s->path, 13, written, errorstr);
     214  if (written != 13 || fflush(s->fid)) {
     215    AUBIO_STRERR("sink_wavwrite: writing header to %s failed"
     216        " (wrote %d/%d, %s)\n", s->path, written, 13, errorstr);
     217    fclose(s->fid);
     218    s->fid = NULL;
    217219    return AUBIO_FAIL;
    218220  }
  • src/io/source.c

    rba740ea r057ecee  
    139139
    140140void del_aubio_source(aubio_source_t * s) {
    141   AUBIO_ASSERT(s);
     141  //AUBIO_ASSERT(s);
    142142  if (s && s->s_del && s->source)
    143143    s->s_del((void *)s->source);
Note: See TracChangeset for help on using the changeset viewer.