Changeset 7585822


Ignore:
Timestamp:
Apr 24, 2016, 7:00:28 PM (4 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
81984a7
Parents:
8b2aafd
Message:

src/, examples/: #ifdef HAVE_, not #if HAVE_

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • examples/jackio.c

    r8b2aafd r7585822  
    2222#include "config.h"
    2323
    24 #if HAVE_JACK
     24#ifdef HAVE_JACK
    2525#include "utils.h" // for aubio_process_func_t
    2626#include "jackio.h"
  • examples/utils.c

    r8b2aafd r7585822  
    7373#if HAVE_JACK
    7474aubio_jack_t *jack_setup;
    75 #endif
     75#endif /* HAVE_JACK */
    7676
    7777void examples_common_init (int argc, char **argv);
     
    115115    samplerate = aubio_jack_get_samplerate (jack_setup);
    116116    source_uri = "jack";
    117 #endif
     117#endif /* HAVE_JACK */
    118118  }
    119119  ibuf = new_fvec (hop_size);
     
    138138  if (usejack) {
    139139
    140 #if HAVE_JACK
     140#ifdef HAVE_JACK
    141141    debug ("Jack activation ...\n");
    142142    aubio_jack_activate (jack_setup, process_func);
     
    144144    pause ();
    145145    aubio_jack_close (jack_setup);
    146 #else
     146#else /* HAVE_JACK */
    147147    usage (stderr, 1);
    148148    outmsg ("Compiled without jack output, exiting.\n");
    149 #endif
     149#endif /* HAVE_JACK */
    150150
    151151  } else {
     
    182182{
    183183  smpl_t mpitch = floor (aubio_freqtomidi (pitch) + .5);
    184 #if HAVE_JACK
     184#ifdef HAVE_JACK
    185185  jack_midi_event_t ev;
    186186  ev.size = 3;
  • src/cvec.c

    r8b2aafd r7585822  
    8686    return;
    8787  }
    88 #if HAVE_MEMCPY_HACKS
     88#ifdef HAVE_MEMCPY_HACKS
    8989  memcpy(t->norm, s->norm, t->length * sizeof(smpl_t));
    9090  memcpy(t->phas, s->phas, t->length * sizeof(smpl_t));
    91 #else
     91#else /* HAVE_MEMCPY_HACKS */
    9292  uint_t j;
    9393  for (j=0; j< t->length; j++) {
     
    9595    t->phas[j] = s->phas[j];
    9696  }
    97 #endif
     97#endif /* HAVE_MEMCPY_HACKS */
    9898}
    9999
     
    106106
    107107void cvec_norm_zeros(cvec_t *s) {
    108 #if HAVE_MEMCPY_HACKS
     108#ifdef HAVE_MEMCPY_HACKS
    109109  memset(s->norm, 0, s->length * sizeof(smpl_t));
    110 #else
     110#else /* HAVE_MEMCPY_HACKS */
    111111  cvec_norm_set_all (s, 0.);
    112 #endif
     112#endif /* HAVE_MEMCPY_HACKS */
    113113}
    114114
     
    125125
    126126void cvec_phas_zeros(cvec_t *s) {
    127 #if HAVE_MEMCPY_HACKS
     127#ifdef HAVE_MEMCPY_HACKS
    128128  memset(s->phas, 0, s->length * sizeof(smpl_t));
    129129#else
  • src/fmat.c

    r8b2aafd r7585822  
    9494
    9595void fmat_zeros(fmat_t *s) {
    96 #if HAVE_MEMCPY_HACKS
     96#ifdef HAVE_MEMCPY_HACKS
    9797  uint_t i;
    9898  for (i=0; i< s->height; i++) {
    9999    memset(s->data[i], 0, s->length * sizeof(smpl_t));
    100100  }
    101 #else
     101#else /* HAVE_MEMCPY_HACKS */
    102102  fmat_set(s, 0.);
    103 #endif
     103#endif /* HAVE_MEMCPY_HACKS */
    104104}
    105105
     
    129129void fmat_copy(const fmat_t *s, fmat_t *t) {
    130130  uint_t i;
    131 #if !HAVE_MEMCPY_HACKS
     131#ifndef HAVE_MEMCPY_HACKS
    132132  uint_t j;
    133 #endif
     133#endif /* HAVE_MEMCPY_HACKS */
    134134  if (s->height != t->height) {
    135135    AUBIO_ERR("trying to copy %d rows to %d rows \n",
     
    142142    return;
    143143  }
    144 #if HAVE_MEMCPY_HACKS
     144#ifdef HAVE_MEMCPY_HACKS
    145145  for (i=0; i< s->height; i++) {
    146146    memcpy(t->data[i], s->data[i], t->length * sizeof(smpl_t));
    147147  }
    148 #else
     148#else /* HAVE_MEMCPY_HACKS */
    149149  for (i=0; i< t->height; i++) {
    150150    for (j=0; j< t->length; j++) {
     
    152152    }
    153153  }
    154 #endif
     154#endif /* HAVE_MEMCPY_HACKS */
    155155}
    156156
  • src/spectral/phasevoc.c

    r8b2aafd r7585822  
    143143  smpl_t * dataold = pv->dataold->data;
    144144  smpl_t * datanew = new->data;
    145 #if !HAVE_MEMCPY_HACKS
     145#ifndef HAVE_MEMCPY_HACKS
    146146  uint_t i;
    147147  for (i = 0; i < pv->end; i++)
Note: See TracChangeset for help on using the changeset viewer.