# HG changeset patch # User Andrew N Robertson # Date 1328435936 0 # Node ID 0a52258accec3a5e3a56c702acbbc46d0fec29e1 # Parent 66783ace7506577ba6e3cb1e4739122016b0162c tmp commit diff -r 66783ace7506 -r 0a52258accec src/AudioEventMatcher.cpp --- a/src/AudioEventMatcher.cpp Sun Feb 05 00:17:28 2012 +0000 +++ b/src/AudioEventMatcher.cpp Sun Feb 05 09:58:56 2012 +0000 @@ -20,10 +20,13 @@ bayesianStruct.realTimeMode = &usingRealTime; recentPitch = 0; currentAlignmentPosition = 0; + + onsetLikelihoodWidth = 20; followingLiveInput = true; } + void AudioEventMatcher::setWindowDimensions(){ double startHeight = recordedTracks.numberOfAudioTracks * recordedTracks.trackScreenHeight; double heightAvailable = 1 - startHeight; @@ -227,8 +230,6 @@ //start at beginning but OPTIMISE later double onsetLikelihoodToNoise = 0.3; - double likelihoodWidth = 40; - bayesianStruct.likelihood.offset = bayesianStruct.prior.offset; bayesianStruct.likelihood.zero();//set to zero @@ -243,7 +244,7 @@ for (int i = 0;i < recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets.size();i++){ double millisTime = recordedTracks.loadedAudioFiles[channel].fileLoader.onsetDetect.chromaOnsets[i].millisTime; if (millisTime >= startMatchingTime && millisTime <= endMatchingTime){ - bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, likelihoodWidth, quantity); + bayesianStruct.likelihood.addGaussianShapeFromRealTime(millisTime, onsetLikelihoodWidth, quantity); numberOfMatchesFound++; // printf("Adding Gaussian for onset at time %f offset %f\n", millisTime, bayesianStruct.likelihood.offset); diff -r 66783ace7506 -r 0a52258accec src/AudioEventMatcher.h --- a/src/AudioEventMatcher.h Sun Feb 05 00:17:28 2012 +0000 +++ b/src/AudioEventMatcher.h Sun Feb 05 09:58:56 2012 +0000 @@ -78,5 +78,8 @@ double screenStartTimeMillis, screenEndTimeMillis, screenWidthMillis; bool followingLiveInput; void setScreenDisplayTimes(); + + //params + double onsetLikelihoodWidth; }; #endif