Merge branch 'RecordImprovements' into develop

This commit is contained in:
Flamefire committed 2014-04-29 21:14:08 +02:00
commit c5d7648628
1 file changed
+3 -1
+3 -1
View File
@@ -76,7 +76,6 @@ void PtAKF::SetVolumeThreshold(float threshold){
int PtAKF::GetNote(float* restrict maxVolume, float* restrict weights){ int PtAKF::GetNote(float* restrict maxVolume, float* restrict weights){
float AnaylsisBuf[_SampleCt]; float AnaylsisBuf[_SampleCt];
int note = _LastTones[_LastToneIndex]; int note = _LastTones[_LastToneIndex];
*maxVolume = _LastMaxVol * 0.85f;
if(_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt)){ if(_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt)){
do{ do{
_AnalysisBuf.pop(_Step); _AnalysisBuf.pop(_Step);
@@ -86,6 +85,9 @@ int PtAKF::GetNote(float* restrict maxVolume, float* restrict weights){
_LastTones[_LastToneIndex] = note; _LastTones[_LastToneIndex] = note;
}while(_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt)); }while(_AnalysisBuf.read(AnaylsisBuf, AnaylsisBuf + _SampleCt));
note = _GetSmoothTone(); note = _GetSmoothTone();
_LastMaxVol = *maxVolume;
}else{
*maxVolume = _LastMaxVol * 0.85f;
} }
return note; return note;
} }