From 32669d979d3b61b852591e63f7ea818e6a7e286b Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Tue, 9 Aug 2005 09:09:43 +0000 Subject: [PATCH] removed obsoleted pickparams_t --- src/peakpick.c | 2 +- src/peakpick.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/peakpick.c b/src/peakpick.c index e060c412..f7aca425 100644 --- a/src/peakpick.c +++ b/src/peakpick.c @@ -113,7 +113,7 @@ uint_t aubio_peakpick_pimrt(fvec_t * onset, aubio_pickpeak_t * p) { } /** function added by Miguel Ramirez to return the onset detection amplitude in peakval */ -uint_t aubio_peakpick_pimrt_wt(fvec_t * onset, pickparams_t * p, smpl_t* peakval) +uint_t aubio_peakpick_pimrt_wt(fvec_t * onset, aubio_pickpeak_t * p, smpl_t* peakval) { fvec_t * onset_keep = (fvec_t *)p->onset_keep; fvec_t * onset_proc = (fvec_t *)p->onset_proc; diff --git a/src/peakpick.h b/src/peakpick.h index 1819f061..75ae3784 100644 --- a/src/peakpick.h +++ b/src/peakpick.h @@ -33,14 +33,11 @@ extern "C" { typedef smpl_t (*aubio_thresholdfn_t)(fvec_t *input); typedef uint_t (*aubio_pickerfn_t)(fvec_t *input, uint_t pos); typedef struct _aubio_pickpeak_t aubio_pickpeak_t; -/* alias for backward compatibility */ -typedef aubio_pickpeak_t pickparams_t; aubio_pickpeak_t * new_aubio_peakpicker(smpl_t threshold); uint_t aubio_peakpick_pimrt(fvec_t * DF, aubio_pickpeak_t * p); /** function added by Miguel Ramirez to return the onset detection amplitude in peakval */ -uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, pickparams_t* p, smpl_t* peakval ); -//smpl_t aubio_peakpick_samerpp(fvec_t * DF, aubio_pickpeak_t * p); +uint_t aubio_peakpick_pimrt_wt( fvec_t* DF, aubio_pickpeak_t* p, smpl_t* peakval ); void del_aubio_peakpicker(aubio_pickpeak_t * p); #ifdef __cplusplus -- 2.11.0