removed obsoleted pickparams_t

diff --git a/src/peakpick.c b/src/peakpick.c
index e060c4129d3115a9ba2239815adf3a0f37fd0245..f7aca425ea621aab9c9cb9a3d174a2671325f699 100644 (file)
--- 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 1819f061fd9109e662193462d753547409423c0f..75ae37842c512716143b0e045bfc7e019a65ff28 100644 (file)
--- 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