Index: src/Makefile.am
===================================================================
--- src/Makefile.am	(revision 56ef7e1e2d47981012ffa6f5fa94691d90729ffa)
+++ src/Makefile.am	(revision ca1abdd5271f95cfc6949637f31d9347358b246e)
@@ -24,5 +24,5 @@
 	spectral/tss.h \
 	spectral/spectral_centroid.h \
-	pitch/pitchdetection.h \
+	pitch/pitch.h \
 	pitch/pitchmcomb.h \
 	pitch/pitchyin.h \
@@ -59,5 +59,5 @@
 	spectral/tss.c \
 	spectral/spectral_centroid.c \
-	pitch/pitchdetection.c \
+	pitch/pitch.c \
 	pitch/pitchmcomb.c \
 	pitch/pitchyin.c \
Index: src/aubio.h
===================================================================
--- src/aubio.h	(revision 56ef7e1e2d47981012ffa6f5fa94691d90729ffa)
+++ src/aubio.h	(revision ca1abdd5271f95cfc6949637f31d9347358b246e)
@@ -82,5 +82,5 @@
 #include "spectral/phasevoc.h"
 #include "spectral/spectral_centroid.h"
-#include "pitch/pitchdetection.h"
+#include "pitch/pitch.h"
 #include "pitch/pitchmcomb.h"
 #include "pitch/pitchyin.h"
Index: src/pitch/pitch.c
===================================================================
--- src/pitch/pitch.c	(revision ca1abdd5271f95cfc6949637f31d9347358b246e)
+++ src/pitch/pitch.c	(revision ca1abdd5271f95cfc6949637f31d9347358b246e)
@@ -0,0 +1,335 @@
+/*
+   Copyright (C) 2003 Paul Brossier
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   */
+
+#include "aubio_priv.h"
+#include "fvec.h"
+#include "cvec.h"
+#include "lvec.h"
+#include "spectral/phasevoc.h"
+#include "mathutils.h"
+#include "temporal/filter.h"
+#include "temporal/c_weighting.h"
+#include "pitch/pitchmcomb.h"
+#include "pitch/pitchyin.h"
+#include "pitch/pitchfcomb.h"
+#include "pitch/pitchschmitt.h"
+#include "pitch/pitchyinfft.h"
+#include "pitch/pitch.h"
+
+/** pitch detection algorithm */
+typedef enum {
+  aubio_pitcht_yin,     /**< YIN algorithm */
+  aubio_pitcht_mcomb,   /**< Multi-comb filter */
+  aubio_pitcht_schmitt, /**< Schmitt trigger */
+  aubio_pitcht_fcomb,   /**< Fast comb filter */
+  aubio_pitcht_yinfft,   /**< Spectral YIN */
+  aubio_pitcht_default = aubio_pitcht_yinfft, /**< the one used when "default" is asked */
+} aubio_pitch_type;
+
+/** pitch detection output mode */
+typedef enum {
+  aubio_pitchm_freq,   /**< Frequency (Hz) */
+  aubio_pitchm_midi,   /**< MIDI note (0.,127) */
+  aubio_pitchm_cent,   /**< Cent */
+  aubio_pitchm_bin,    /**< Frequency bin (0,bufsize) */
+  aubio_pitchm_default = aubio_pitchm_freq, /**< the one used when "default" is asked */
+} aubio_pitch_mode;
+
+typedef void (*aubio_pitch_func_t)
+  (aubio_pitch_t *p, fvec_t * ibuf, fvec_t *obuf);
+typedef smpl_t (*aubio_pitch_conv_t)
+  (smpl_t value, uint_t srate, uint_t bufsize);
+
+void aubio_pitch_slideblock(aubio_pitch_t *p, fvec_t *ibuf);
+
+void aubio_pitch_do_mcomb   (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_yin     (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_schmitt (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_fcomb   (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+void aubio_pitch_do_yinfft  (aubio_pitch_t *p, fvec_t *ibuf, fvec_t *obuf);
+
+/** generic pitch detection structure */
+struct _aubio_pitch_t {
+  aubio_pitch_type type; /**< pitch detection mode */
+  aubio_pitch_mode mode; /**< pitch detection output mode */
+  uint_t srate;                   /**< samplerate */
+  uint_t bufsize;                 /**< buffer size */
+  aubio_pitchmcomb_t * mcomb;     /**< mcomb object */
+  aubio_pitchfcomb_t * fcomb;     /**< fcomb object */
+  aubio_pitchschmitt_t * schmitt; /**< schmitt object */
+  aubio_pitchyinfft_t * yinfft;   /**< yinfft object */
+  aubio_pitchyin_t * yin;   /**< yinfft object */
+  aubio_filter_t * filter;        /**< filter */
+  aubio_pvoc_t * pv;              /**< phase vocoder for mcomb */ 
+  cvec_t * fftgrain;              /**< spectral frame for mcomb */
+  fvec_t * buf;                   /**< temporary buffer for yin */
+  aubio_pitch_func_t callback; /**< pointer to current pitch detection method */
+  aubio_pitch_conv_t freqconv; /**< pointer to current pitch conversion method */ 
+};
+
+/* convenience wrapper function for frequency unit conversions 
+ * should probably be rewritten with #defines */
+smpl_t freqconvbin(smpl_t f,uint_t srate,uint_t bufsize);
+smpl_t freqconvbin(smpl_t f,uint_t srate,uint_t bufsize){
+  return aubio_freqtobin(f,srate,bufsize);
+}
+
+smpl_t freqconvmidi(smpl_t f,uint_t srate,uint_t bufsize);
+smpl_t freqconvmidi(smpl_t f,uint_t srate UNUSED,uint_t bufsize UNUSED){
+  return aubio_freqtomidi(f);
+}
+
+smpl_t freqconvpass(smpl_t f,uint_t srate,uint_t bufsize);
+smpl_t freqconvpass(smpl_t f,uint_t srate UNUSED,uint_t bufsize UNUSED){
+  return f;
+}
+
+aubio_pitch_t *
+new_aubio_pitch (char_t * pitch_mode,
+    uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate)
+{
+  aubio_pitch_t *p = AUBIO_NEW(aubio_pitch_t);
+  aubio_pitch_type pitch_type;
+  if (strcmp (pitch_mode, "mcomb") == 0)
+      pitch_type = aubio_pitcht_mcomb;
+  else if (strcmp (pitch_mode, "yinfft") == 0)
+      pitch_type = aubio_pitcht_yin;
+  else if (strcmp (pitch_mode, "yin") == 0)
+      pitch_type = aubio_pitcht_yin;
+  else if (strcmp (pitch_mode, "schmitt") == 0)
+      pitch_type = aubio_pitcht_schmitt;
+  else if (strcmp (pitch_mode, "fcomb") == 0)
+      pitch_type = aubio_pitcht_fcomb;
+  else if (strcmp (pitch_mode, "default") == 0)
+      pitch_type = aubio_pitcht_default;
+  else {
+      AUBIO_ERR ("unknown pitch detection method %s, using default.\n", pitch_mode);
+      pitch_type = aubio_pitcht_default;
+      return NULL;
+  }
+  p->srate = samplerate;
+  p->type = pitch_type;
+  aubio_pitch_set_unit (p, "default");
+  p->bufsize = bufsize;
+  switch(p->type) {
+    case aubio_pitcht_yin:
+      p->buf      = new_fvec(bufsize,channels);
+      p->yin      = new_aubio_pitchyin(bufsize);
+      p->callback = aubio_pitch_do_yin;
+      aubio_pitchyin_set_tolerance (p->yin, 0.15);
+      break;
+    case aubio_pitcht_mcomb:
+      p->pv       = new_aubio_pvoc(bufsize, hopsize, channels);
+      p->fftgrain = new_cvec(bufsize, channels);
+      p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels);
+      p->filter   = new_aubio_filter_c_weighting (samplerate, channels);
+      p->callback = aubio_pitch_do_mcomb;
+      break;
+    case aubio_pitcht_fcomb:
+      p->buf      = new_fvec(bufsize,channels);
+      p->fcomb    = new_aubio_pitchfcomb(bufsize,hopsize,channels);
+      p->callback = aubio_pitch_do_fcomb;
+      break;
+    case aubio_pitcht_schmitt:
+      p->buf      = new_fvec(bufsize,channels);
+      p->schmitt  = new_aubio_pitchschmitt(bufsize);
+      p->callback = aubio_pitch_do_schmitt;
+      break;
+    case aubio_pitcht_yinfft:
+      p->buf      = new_fvec(bufsize,channels);
+      p->yinfft   = new_aubio_pitchyinfft(bufsize);
+      p->callback = aubio_pitch_do_yinfft;
+      aubio_pitchyinfft_set_tolerance (p->yinfft, 0.85);
+      break;
+    default:
+      break;
+  }
+  return p;
+}
+
+void del_aubio_pitch(aubio_pitch_t * p) {
+  switch(p->type) {
+    case aubio_pitcht_yin:
+      del_fvec(p->buf);
+      del_aubio_pitchyin(p->yin);
+      break;
+    case aubio_pitcht_mcomb:
+      del_aubio_pvoc(p->pv);
+      del_cvec(p->fftgrain);
+      del_aubio_filter(p->filter);
+      del_aubio_pitchmcomb(p->mcomb);
+      break;
+    case aubio_pitcht_schmitt:
+      del_fvec(p->buf);
+      del_aubio_pitchschmitt(p->schmitt);
+      break;
+    case aubio_pitcht_fcomb:
+      del_fvec(p->buf);
+      del_aubio_pitchfcomb(p->fcomb);
+      break;
+    case aubio_pitcht_yinfft:
+      del_fvec(p->buf);
+      del_aubio_pitchyinfft(p->yinfft);
+      break;
+    default:
+      break;
+  }
+  AUBIO_FREE(p);
+}
+
+void aubio_pitch_slideblock(aubio_pitch_t *p, fvec_t *ibuf){
+  uint_t i,j = 0, overlap_size = 0;
+  overlap_size = p->buf->length-ibuf->length;
+  for (i=0;i<p->buf->channels;i++){
+    for (j=0;j<overlap_size;j++){
+      p->buf->data[i][j] = p->buf->data[i][j+ibuf->length];
+    }
+  }
+  for (i=0;i<ibuf->channels;i++){
+    for (j=0;j<ibuf->length;j++){
+      p->buf->data[i][j+overlap_size] = ibuf->data[i][j];
+    }
+  }
+}
+
+uint_t aubio_pitch_set_unit (aubio_pitch_t *p, char_t * pitch_unit) {
+  aubio_pitch_mode pitch_mode;
+  if (strcmp (pitch_unit, "freq") == 0)
+      pitch_mode = aubio_pitchm_freq;
+  else if (strcmp (pitch_unit, "midi") == 0)
+      pitch_mode = aubio_pitchm_midi;
+  else if (strcmp (pitch_unit, "cent") == 0)
+      pitch_mode = aubio_pitchm_cent;
+  else if (strcmp (pitch_unit, "bin") == 0)
+      pitch_mode = aubio_pitchm_bin;
+  else if (strcmp (pitch_unit, "default") == 0)
+      pitch_mode = aubio_pitchm_default;
+  else {
+      AUBIO_ERR ("unknown pitch detection unit %s, using default\n", pitch_unit);
+      pitch_mode = aubio_pitchm_default;
+  }
+  p->mode = pitch_mode;
+  switch(p->mode) {
+    case aubio_pitchm_freq:
+      p->freqconv = freqconvpass;
+      break;
+    case aubio_pitchm_midi:
+      p->freqconv = freqconvmidi;
+      break;
+    case aubio_pitchm_cent:
+      /* bug: not implemented */
+      p->freqconv = freqconvmidi;
+      break;
+    case aubio_pitchm_bin:
+      p->freqconv = freqconvbin;
+      break;
+    default:
+      break;
+  }
+  return AUBIO_OK;
+}
+
+uint_t aubio_pitch_set_tolerance(aubio_pitch_t *p, smpl_t tol) {
+  switch(p->type) {
+    case aubio_pitcht_yin:
+      aubio_pitchyin_set_tolerance (p->yin, tol);
+      break;
+    case aubio_pitcht_yinfft:
+      aubio_pitchyinfft_set_tolerance (p->yinfft, tol);
+      break;
+    default:
+      break;
+  }
+  return AUBIO_OK;
+}
+
+void aubio_pitch_do (aubio_pitch_t *p, fvec_t * ibuf, fvec_t *obuf) {
+  uint_t i;
+  p->callback(p, ibuf, obuf);
+  for (i = 0; i < obuf->channels; i++) {
+    p->freqconv(obuf->data[i][0],p->srate,p->bufsize);
+  }
+}
+
+void aubio_pitch_do_mcomb(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * obuf) {
+  uint_t i;
+  aubio_filter_do(p->filter,ibuf);
+  aubio_pvoc_do(p->pv,ibuf,p->fftgrain);
+  aubio_pitchmcomb_do(p->mcomb,p->fftgrain, obuf);
+  for (i = 0; i < obuf->channels; i++) {
+    obuf->data[i][0] = aubio_bintofreq (obuf->data[i][0], p->srate, p->bufsize);
+  }
+}
+
+void aubio_pitch_do_yin(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * obuf) {
+  smpl_t pitch = 0.;
+  uint_t i;
+  aubio_pitch_slideblock(p,ibuf);
+  aubio_pitchyin_do(p->yin,p->buf, obuf);
+  for (i = 0; i < obuf->channels; i++) {
+    pitch = obuf->data[i][0];
+    if (pitch>0) {
+      pitch = p->srate/(pitch+0.);
+    } else {
+      pitch = 0.;
+    }
+    obuf->data[i][0] = pitch;
+  }
+}
+
+
+void aubio_pitch_do_yinfft(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * obuf){
+  smpl_t pitch = 0.;
+  uint_t i;
+  aubio_pitch_slideblock(p,ibuf);
+  aubio_pitchyinfft_do(p->yinfft,p->buf,obuf);
+  for (i = 0; i < obuf->channels; i++) {
+    pitch = obuf->data[i][0];
+    if (pitch>0) {
+      pitch = p->srate/(pitch+0.);
+    } else {
+      pitch = 0.;
+    }
+    obuf->data[i][0] = pitch;
+  }
+}
+
+void aubio_pitch_do_fcomb(aubio_pitch_t *p, fvec_t *ibuf, fvec_t * out){
+  uint_t i;
+  aubio_pitch_slideblock(p,ibuf);
+  aubio_pitchfcomb_do(p->fcomb,p->buf, out);
+  for (i = 0; i < out->channels; i++) {
+    out->data[i][0] = aubio_bintofreq (out->data[i][0], p->srate, p->bufsize);
+  }
+}
+
+void aubio_pitch_do_schmitt(aubio_pitch_t *p, fvec_t *ibuf, fvec_t *out){
+  smpl_t period, pitch = 0.;
+  uint_t i;
+  aubio_pitch_slideblock(p,ibuf);
+  aubio_pitchschmitt_do(p->schmitt,p->buf, out);
+  for (i = 0; i < out->channels; i++) {
+    period = out->data[i][0];
+    if (period>0) {
+      pitch = p->srate/period;
+    } else {
+      pitch = 0.;
+    }
+    out->data[i][0] = pitch;
+  }
+}
Index: src/pitch/pitch.h
===================================================================
--- src/pitch/pitch.h	(revision ca1abdd5271f95cfc6949637f31d9347358b246e)
+++ src/pitch/pitch.h	(revision ca1abdd5271f95cfc6949637f31d9347358b246e)
@@ -0,0 +1,89 @@
+/*
+   Copyright (C) 2003 Paul Brossier
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   */
+
+#ifndef PITCH_H
+#define PITCH_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** \file
+
+  Generic method for pitch detection
+
+  This file creates the objects required for the computation of the selected
+  pitch detection algorithm and output the results, in midi note or Hz.
+
+*/
+
+/** pitch detection object */
+typedef struct _aubio_pitch_t aubio_pitch_t;
+
+/** execute pitch detection on an input signal frame
+
+  \param o pitch detection object as returned by new_aubio_pitch()
+  \param in input signal of size [hopsize x channels]
+  \param out output pitch candidates of size [1 x channes]
+
+*/
+void aubio_pitch_do (aubio_pitch_t * o, fvec_t * in,
+    fvec_t * out);
+
+/** change yin or yinfft tolerance threshold
+
+  \param o pitch detection object as returned by new_aubio_pitch()
+  \param tol tolerance default is 0.15 for yin and 0.85 for yinfft
+
+*/
+uint_t aubio_pitch_set_tolerance (aubio_pitch_t * o,
+    smpl_t tol);
+
+/** deletion of the pitch detection object
+
+  \param o pitch detection object as returned by new_aubio_pitch()
+
+*/
+void del_aubio_pitch (aubio_pitch_t * o);
+
+/** creation of the pitch detection object
+
+  \param mode set pitch detection algorithm
+  \param bufsize size of the input buffer to analyse
+  \param hopsize step size between two consecutive analysis instant
+  \param channels number of channels to analyse
+  \param samplerate sampling rate of the signal
+
+*/
+aubio_pitch_t * new_aubio_pitch (char_t * mode,
+    uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
+
+/** set the output unit of the pitch detection object 
+
+  \param o pitch detection object as returned by new_aubio_pitch()
+  \param mode set pitch units for output
+
+*/
+uint_t aubio_pitch_set_unit (aubio_pitch_t * o,
+    char_t * mode);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /*PITCH_H*/
Index: src/pitch/pitchdetection.c
===================================================================
--- src/pitch/pitchdetection.c	(revision 56ef7e1e2d47981012ffa6f5fa94691d90729ffa)
+++ 	(revision )
@@ -1,335 +1,0 @@
-/*
-   Copyright (C) 2003 Paul Brossier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-   */
-
-#include "aubio_priv.h"
-#include "fvec.h"
-#include "cvec.h"
-#include "lvec.h"
-#include "spectral/phasevoc.h"
-#include "mathutils.h"
-#include "temporal/filter.h"
-#include "temporal/c_weighting.h"
-#include "pitch/pitchmcomb.h"
-#include "pitch/pitchyin.h"
-#include "pitch/pitchfcomb.h"
-#include "pitch/pitchschmitt.h"
-#include "pitch/pitchyinfft.h"
-#include "pitch/pitchdetection.h"
-
-/** pitch detection algorithm */
-typedef enum {
-  aubio_pitch_yin,     /**< YIN algorithm */
-  aubio_pitch_mcomb,   /**< Multi-comb filter */
-  aubio_pitch_schmitt, /**< Schmitt trigger */
-  aubio_pitch_fcomb,   /**< Fast comb filter */
-  aubio_pitch_yinfft,   /**< Spectral YIN */
-  aubio_pitch_default = aubio_pitch_yinfft, /**< the one used when "default" is asked */
-} aubio_pitchdetection_type;
-
-/** pitch detection output mode */
-typedef enum {
-  aubio_pitchm_freq,   /**< Frequency (Hz) */
-  aubio_pitchm_midi,   /**< MIDI note (0.,127) */
-  aubio_pitchm_cent,   /**< Cent */
-  aubio_pitchm_bin,    /**< Frequency bin (0,bufsize) */
-  aubio_pitchm_default = aubio_pitchm_freq, /**< the one used when "default" is asked */
-} aubio_pitchdetection_mode;
-
-typedef void (*aubio_pitchdetection_func_t)
-  (aubio_pitchdetection_t *p, fvec_t * ibuf, fvec_t *obuf);
-typedef smpl_t (*aubio_pitchdetection_conv_t)
-  (smpl_t value, uint_t srate, uint_t bufsize);
-
-void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf);
-
-void aubio_pitchdetection_mcomb   (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_yin     (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_schmitt (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_fcomb   (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-void aubio_pitchdetection_yinfft  (aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *obuf);
-
-/** generic pitch detection structure */
-struct _aubio_pitchdetection_t {
-  aubio_pitchdetection_type type; /**< pitch detection mode */
-  aubio_pitchdetection_mode mode; /**< pitch detection output mode */
-  uint_t srate;                   /**< samplerate */
-  uint_t bufsize;                 /**< buffer size */
-  aubio_pitchmcomb_t * mcomb;     /**< mcomb object */
-  aubio_pitchfcomb_t * fcomb;     /**< fcomb object */
-  aubio_pitchschmitt_t * schmitt; /**< schmitt object */
-  aubio_pitchyinfft_t * yinfft;   /**< yinfft object */
-  aubio_pitchyin_t * yin;   /**< yinfft object */
-  aubio_filter_t * filter;        /**< filter */
-  aubio_pvoc_t * pv;              /**< phase vocoder for mcomb */ 
-  cvec_t * fftgrain;              /**< spectral frame for mcomb */
-  fvec_t * buf;                   /**< temporary buffer for yin */
-  aubio_pitchdetection_func_t callback; /**< pointer to current pitch detection method */
-  aubio_pitchdetection_conv_t freqconv; /**< pointer to current pitch conversion method */ 
-};
-
-/* convenience wrapper function for frequency unit conversions 
- * should probably be rewritten with #defines */
-smpl_t freqconvbin(smpl_t f,uint_t srate,uint_t bufsize);
-smpl_t freqconvbin(smpl_t f,uint_t srate,uint_t bufsize){
-  return aubio_freqtobin(f,srate,bufsize);
-}
-
-smpl_t freqconvmidi(smpl_t f,uint_t srate,uint_t bufsize);
-smpl_t freqconvmidi(smpl_t f,uint_t srate UNUSED,uint_t bufsize UNUSED){
-  return aubio_freqtomidi(f);
-}
-
-smpl_t freqconvpass(smpl_t f,uint_t srate,uint_t bufsize);
-smpl_t freqconvpass(smpl_t f,uint_t srate UNUSED,uint_t bufsize UNUSED){
-  return f;
-}
-
-aubio_pitchdetection_t *
-new_aubio_pitchdetection (char_t * pitch_mode,
-    uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate)
-{
-  aubio_pitchdetection_t *p = AUBIO_NEW(aubio_pitchdetection_t);
-  aubio_pitchdetection_type pitch_type;
-  if (strcmp (pitch_mode, "mcomb") == 0)
-      pitch_type = aubio_pitch_mcomb;
-  else if (strcmp (pitch_mode, "yinfft") == 0)
-      pitch_type = aubio_pitch_yin;
-  else if (strcmp (pitch_mode, "yin") == 0)
-      pitch_type = aubio_pitch_yin;
-  else if (strcmp (pitch_mode, "schmitt") == 0)
-      pitch_type = aubio_pitch_schmitt;
-  else if (strcmp (pitch_mode, "fcomb") == 0)
-      pitch_type = aubio_pitch_fcomb;
-  else if (strcmp (pitch_mode, "default") == 0)
-      pitch_type = aubio_pitch_default;
-  else {
-      AUBIO_ERR ("unknown pitch detection method %s, using default.\n", pitch_mode);
-      pitch_type = aubio_pitch_default;
-      return NULL;
-  }
-  p->srate = samplerate;
-  p->type = pitch_type;
-  aubio_pitchdetection_set_unit (p, "default");
-  p->bufsize = bufsize;
-  switch(p->type) {
-    case aubio_pitch_yin:
-      p->buf      = new_fvec(bufsize,channels);
-      p->yin      = new_aubio_pitchyin(bufsize);
-      p->callback = aubio_pitchdetection_yin;
-      aubio_pitchyin_set_tolerance (p->yin, 0.15);
-      break;
-    case aubio_pitch_mcomb:
-      p->pv       = new_aubio_pvoc(bufsize, hopsize, channels);
-      p->fftgrain = new_cvec(bufsize, channels);
-      p->mcomb    = new_aubio_pitchmcomb(bufsize,hopsize,channels);
-      p->filter   = new_aubio_filter_c_weighting (samplerate, channels);
-      p->callback = aubio_pitchdetection_mcomb;
-      break;
-    case aubio_pitch_fcomb:
-      p->buf      = new_fvec(bufsize,channels);
-      p->fcomb    = new_aubio_pitchfcomb(bufsize,hopsize,channels);
-      p->callback = aubio_pitchdetection_fcomb;
-      break;
-    case aubio_pitch_schmitt:
-      p->buf      = new_fvec(bufsize,channels);
-      p->schmitt  = new_aubio_pitchschmitt(bufsize);
-      p->callback = aubio_pitchdetection_schmitt;
-      break;
-    case aubio_pitch_yinfft:
-      p->buf      = new_fvec(bufsize,channels);
-      p->yinfft   = new_aubio_pitchyinfft(bufsize);
-      p->callback = aubio_pitchdetection_yinfft;
-      aubio_pitchyinfft_set_tolerance (p->yinfft, 0.85);
-      break;
-    default:
-      break;
-  }
-  return p;
-}
-
-void del_aubio_pitchdetection(aubio_pitchdetection_t * p) {
-  switch(p->type) {
-    case aubio_pitch_yin:
-      del_fvec(p->buf);
-      del_aubio_pitchyin(p->yin);
-      break;
-    case aubio_pitch_mcomb:
-      del_aubio_pvoc(p->pv);
-      del_cvec(p->fftgrain);
-      del_aubio_filter(p->filter);
-      del_aubio_pitchmcomb(p->mcomb);
-      break;
-    case aubio_pitch_schmitt:
-      del_fvec(p->buf);
-      del_aubio_pitchschmitt(p->schmitt);
-      break;
-    case aubio_pitch_fcomb:
-      del_fvec(p->buf);
-      del_aubio_pitchfcomb(p->fcomb);
-      break;
-    case aubio_pitch_yinfft:
-      del_fvec(p->buf);
-      del_aubio_pitchyinfft(p->yinfft);
-      break;
-    default:
-      break;
-  }
-  AUBIO_FREE(p);
-}
-
-void aubio_pitchdetection_slideblock(aubio_pitchdetection_t *p, fvec_t *ibuf){
-  uint_t i,j = 0, overlap_size = 0;
-  overlap_size = p->buf->length-ibuf->length;
-  for (i=0;i<p->buf->channels;i++){
-    for (j=0;j<overlap_size;j++){
-      p->buf->data[i][j] = p->buf->data[i][j+ibuf->length];
-    }
-  }
-  for (i=0;i<ibuf->channels;i++){
-    for (j=0;j<ibuf->length;j++){
-      p->buf->data[i][j+overlap_size] = ibuf->data[i][j];
-    }
-  }
-}
-
-uint_t aubio_pitchdetection_set_unit (aubio_pitchdetection_t *p, char_t * pitch_unit) {
-  aubio_pitchdetection_mode pitch_mode;
-  if (strcmp (pitch_unit, "freq") == 0)
-      pitch_mode = aubio_pitchm_freq;
-  else if (strcmp (pitch_unit, "midi") == 0)
-      pitch_mode = aubio_pitchm_midi;
-  else if (strcmp (pitch_unit, "cent") == 0)
-      pitch_mode = aubio_pitchm_cent;
-  else if (strcmp (pitch_unit, "bin") == 0)
-      pitch_mode = aubio_pitchm_bin;
-  else if (strcmp (pitch_unit, "default") == 0)
-      pitch_mode = aubio_pitchm_default;
-  else {
-      AUBIO_ERR ("unknown pitch detection unit %s, using default\n", pitch_unit);
-      pitch_mode = aubio_pitchm_default;
-  }
-  p->mode = pitch_mode;
-  switch(p->mode) {
-    case aubio_pitchm_freq:
-      p->freqconv = freqconvpass;
-      break;
-    case aubio_pitchm_midi:
-      p->freqconv = freqconvmidi;
-      break;
-    case aubio_pitchm_cent:
-      /* bug: not implemented */
-      p->freqconv = freqconvmidi;
-      break;
-    case aubio_pitchm_bin:
-      p->freqconv = freqconvbin;
-      break;
-    default:
-      break;
-  }
-  return AUBIO_OK;
-}
-
-uint_t aubio_pitchdetection_set_tolerance(aubio_pitchdetection_t *p, smpl_t tol) {
-  switch(p->type) {
-    case aubio_pitch_yin:
-      aubio_pitchyin_set_tolerance (p->yin, tol);
-      break;
-    case aubio_pitch_yinfft:
-      aubio_pitchyinfft_set_tolerance (p->yinfft, tol);
-      break;
-    default:
-      break;
-  }
-  return AUBIO_OK;
-}
-
-void aubio_pitchdetection_do (aubio_pitchdetection_t *p, fvec_t * ibuf, fvec_t *obuf) {
-  uint_t i;
-  p->callback(p, ibuf, obuf);
-  for (i = 0; i < obuf->channels; i++) {
-    p->freqconv(obuf->data[i][0],p->srate,p->bufsize);
-  }
-}
-
-void aubio_pitchdetection_mcomb(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * obuf) {
-  uint_t i;
-  aubio_filter_do(p->filter,ibuf);
-  aubio_pvoc_do(p->pv,ibuf,p->fftgrain);
-  aubio_pitchmcomb_do(p->mcomb,p->fftgrain, obuf);
-  for (i = 0; i < obuf->channels; i++) {
-    obuf->data[i][0] = aubio_bintofreq (obuf->data[i][0], p->srate, p->bufsize);
-  }
-}
-
-void aubio_pitchdetection_yin(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * obuf) {
-  smpl_t pitch = 0.;
-  uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
-  aubio_pitchyin_do(p->yin,p->buf, obuf);
-  for (i = 0; i < obuf->channels; i++) {
-    pitch = obuf->data[i][0];
-    if (pitch>0) {
-      pitch = p->srate/(pitch+0.);
-    } else {
-      pitch = 0.;
-    }
-    obuf->data[i][0] = pitch;
-  }
-}
-
-
-void aubio_pitchdetection_yinfft(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * obuf){
-  smpl_t pitch = 0.;
-  uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
-  aubio_pitchyinfft_do(p->yinfft,p->buf,obuf);
-  for (i = 0; i < obuf->channels; i++) {
-    pitch = obuf->data[i][0];
-    if (pitch>0) {
-      pitch = p->srate/(pitch+0.);
-    } else {
-      pitch = 0.;
-    }
-    obuf->data[i][0] = pitch;
-  }
-}
-
-void aubio_pitchdetection_fcomb(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t * out){
-  uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
-  aubio_pitchfcomb_do(p->fcomb,p->buf, out);
-  for (i = 0; i < out->channels; i++) {
-    out->data[i][0] = aubio_bintofreq (out->data[i][0], p->srate, p->bufsize);
-  }
-}
-
-void aubio_pitchdetection_schmitt(aubio_pitchdetection_t *p, fvec_t *ibuf, fvec_t *out){
-  smpl_t period, pitch = 0.;
-  uint_t i;
-  aubio_pitchdetection_slideblock(p,ibuf);
-  aubio_pitchschmitt_do(p->schmitt,p->buf, out);
-  for (i = 0; i < out->channels; i++) {
-    period = out->data[i][0];
-    if (period>0) {
-      pitch = p->srate/period;
-    } else {
-      pitch = 0.;
-    }
-    out->data[i][0] = pitch;
-  }
-}
Index: src/pitch/pitchdetection.h
===================================================================
--- src/pitch/pitchdetection.h	(revision 56ef7e1e2d47981012ffa6f5fa94691d90729ffa)
+++ 	(revision )
@@ -1,89 +1,0 @@
-/*
-   Copyright (C) 2003 Paul Brossier
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-   */
-
-#ifndef PITCHAUTOTCORR_H
-#define PITCHAUTOTCORR_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** \file
-
-  Generic method for pitch detection
-
-  This file creates the objects required for the computation of the selected
-  pitch detection algorithm and output the results, in midi note or Hz.
-
-*/
-
-/** pitch detection object */
-typedef struct _aubio_pitchdetection_t aubio_pitchdetection_t;
-
-/** execute pitch detection on an input signal frame
-
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
-  \param in input signal of size [hopsize x channels]
-  \param out output pitch candidates of size [1 x channes]
-
-*/
-void aubio_pitchdetection_do (aubio_pitchdetection_t * o, fvec_t * in,
-    fvec_t * out);
-
-/** change yin or yinfft tolerance threshold
-
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
-  \param tol tolerance default is 0.15 for yin and 0.85 for yinfft
-
-*/
-uint_t aubio_pitchdetection_set_tolerance (aubio_pitchdetection_t * o,
-    smpl_t tol);
-
-/** deletion of the pitch detection object
-
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
-
-*/
-void del_aubio_pitchdetection (aubio_pitchdetection_t * o);
-
-/** creation of the pitch detection object
-
-  \param mode set pitch detection algorithm
-  \param bufsize size of the input buffer to analyse
-  \param hopsize step size between two consecutive analysis instant
-  \param channels number of channels to analyse
-  \param samplerate sampling rate of the signal
-
-*/
-aubio_pitchdetection_t *new_aubio_pitchdetection (char_t * mode,
-    uint_t bufsize, uint_t hopsize, uint_t channels, uint_t samplerate);
-
-/** set the output unit of the pitch detection object 
-
-  \param o pitch detection object as returned by new_aubio_pitchdetection()
-  \param mode set pitch units for output
-
-*/
-uint_t aubio_pitchdetection_set_unit (aubio_pitchdetection_t * o,
-    char_t * mode);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*PITCHDETECTION_H*/
