From 1c3717e3a841fcf50c69af3bab74c3b447fa6b22 Mon Sep 17 00:00:00 2001 From: kevin Date: Fri, 24 May 2013 15:07:38 -0700 Subject: [PATCH] cmProc2.h:Finished 'bump' mode. --- cmProc2.c | 5 +++-- cmProc2.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmProc2.c b/cmProc2.c index 370ddbb..4d006e7 100644 --- a/cmProc2.c +++ b/cmProc2.c @@ -3860,7 +3860,7 @@ void _cmSpecDistBump( cmSpecDist_t* p, cmReal_t* x, unsigned binCnt, double thre */ unsigned i=0; - printf("%f %f %f\n",thresh,p->lwrSlope,x[0]); + //printf("%f %f %f\n",thresh,p->lwrSlope,x[0]); double minDb = -100.0; thresh = -thresh; @@ -3958,8 +3958,9 @@ cmRC_t cmSpecDistExec( cmSpecDist_t* p, const cmSample_t* sp, unsigned sn ) } break; - case 4: + case kBumpSdId: _cmSpecDistBump(p,X1m, p->pva->binCnt, p->thresh); + _cmSpecDistBasicMode(p,X1m,p->pva->binCnt,p->thresh); break; case 5: diff --git a/cmProc2.h b/cmProc2.h index 30e885f..9a1d185 100644 --- a/cmProc2.h +++ b/cmProc2.h @@ -772,6 +772,7 @@ extern "C" { kBasicModeSdId, // 1 - fixed thresh kSpecCentSdId, // 2 - thresh = max magn - (offset * spec_cent) kAmpEnvSdId, // 3 - thresh = max magn - offset + kBumpSdId, kModeSdCnt };