From: Paul Brossier Date: Wed, 28 Nov 2018 14:30:11 +0000 (+0100) Subject: [pitch] comment out unused functions in mcomb and yin X-Git-Tag: 0.4.9~140 X-Git-Url: https://git.aubio.org/?p=aubio.git;a=commitdiff_plain;h=c0ce78fc1b46449b7e03a0d77a2a4b453400d87d [pitch] comment out unused functions in mcomb and yin --- diff --git a/src/pitch/pitchmcomb.c b/src/pitch/pitchmcomb.c index f9ec6107..9ce160ed 100644 --- a/src/pitch/pitchmcomb.c +++ b/src/pitch/pitchmcomb.c @@ -37,6 +37,7 @@ void aubio_pitchmcomb_combdet (aubio_pitchmcomb_t * p, const fvec_t * newmag); /* not used but useful : sort by amplitudes (or anything else) * sort_pitchpeak(peaks, length); */ +#if 0 /** spectral_peak comparison function (must return signed int) */ static sint_t aubio_pitchmcomb_sort_peak_comp (const void *x, const void *y); /** sort spectral_peak against their mag */ @@ -44,13 +45,16 @@ void aubio_pitchmcomb_sort_peak (aubio_spectralpeak_t * peaks, uint_t nbins); /** select the best candidates */ uint_t aubio_pitch_cands (aubio_pitchmcomb_t * p, const cvec_t * fftgrain, smpl_t * cands); +#endif /** sort spectral_candidate against their comb ene */ void aubio_pitchmcomb_sort_cand_ene (aubio_spectralcandidate_t ** candidates, uint_t nbins); +#if 0 /** sort spectral_candidate against their frequency */ void aubio_pitchmcomb_sort_cand_freq (aubio_spectralcandidate_t ** candidates, uint_t nbins); +#endif struct _aubio_pitchmcomb_t { @@ -133,6 +137,7 @@ aubio_pitchmcomb_do (aubio_pitchmcomb_t * p, const cvec_t * fftgrain, fvec_t * o } */ } +#if 0 uint_t aubio_pitch_cands (aubio_pitchmcomb_t * p, const cvec_t * fftgrain, smpl_t * cands) { @@ -163,6 +168,7 @@ aubio_pitch_cands (aubio_pitchmcomb_t * p, const cvec_t * fftgrain, smpl_t * can return 0; } } +#endif void aubio_pitchmcomb_spectral_pp (aubio_pitchmcomb_t * p, const fvec_t * newmag) @@ -313,6 +319,7 @@ aubio_pitchmcomb_get_root_peak (aubio_spectralpeak_t * peaks, uint_t length) return pos; } +#if 0 void aubio_pitchmcomb_sort_peak (aubio_spectralpeak_t * peaks, uint_t nbins) { @@ -342,7 +349,6 @@ aubio_pitchmcomb_sort_cand_ene (aubio_spectralcandidate_t ** candidates, } } - void aubio_pitchmcomb_sort_cand_freq (aubio_spectralcandidate_t ** candidates, uint_t nbins) @@ -356,6 +362,7 @@ aubio_pitchmcomb_sort_cand_freq (aubio_spectralcandidate_t ** candidates, } } } +#endif aubio_pitchmcomb_t * new_aubio_pitchmcomb (uint_t bufsize, uint_t hopsize) diff --git a/src/pitch/pitchyin.c b/src/pitch/pitchyin.c index 32934f61..85b4566b 100644 --- a/src/pitch/pitchyin.c +++ b/src/pitch/pitchyin.c @@ -39,6 +39,7 @@ struct _aubio_pitchyin_t uint_t peak_pos; }; +#if 0 /** compute difference function \param input input signal @@ -60,6 +61,7 @@ void aubio_pitchyin_getcum (fvec_t * yinbuf); */ uint_t aubio_pitchyin_getpitch (const fvec_t * yinbuf); +#endif aubio_pitchyin_t * new_aubio_pitchyin (uint_t bufsize) @@ -78,6 +80,7 @@ del_aubio_pitchyin (aubio_pitchyin_t * o) AUBIO_FREE (o); } +#if 0 /* outputs the difference function */ void aubio_pitchyin_diff (fvec_t * input, fvec_t * yin) @@ -127,6 +130,7 @@ aubio_pitchyin_getpitch (const fvec_t * yin) //AUBIO_DBG("No pitch found"); return 0; } +#endif /* all the above in one */ void