Changeset 41b985f for src/pitch/pitchfcomb.c

Timestamp:

Mar 12, 2017, 11:26:24 AM (7 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

bde49c4a

Parents:

71f2e5f (diff), 67b6618 (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 'origin/master' into sampler

Conflicts:

.travis.yml
Makefile
examples/aubionotes.c
examples/parse_args.h
python/demos/demo_timestretch_online.py
python/lib/moresetuptools.py
python/tests/test_source.py
setup.py
src/io/source.c

File:

• src/pitch/pitchfcomb.c (modified) (1 diff)

src/pitch/pitchfcomb.c

@@ -54 +54 @@
   p->fftSize = bufsize;
   p->stepSize = hopsize;
+  p->fft = new_aubio_fft (bufsize);
+  if (!p->fft) goto beach;
   p->winput = new_fvec (bufsize);
   p->fftOut = new_cvec (bufsize);
   p->fftLastPhase = new_fvec (bufsize);
-  p->fft = new_aubio_fft (bufsize);
   p->win = new_aubio_window ("hanning", bufsize);
   return p;
+
+beach:
+  AUBIO_FREE(p);
+  return NULL;
 }