Mercurial > hg > audio-time-warp
changeset 7:fc0a8412d6fb
working now..test further the loader and reloading files
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 04 Nov 2011 23:23:13 +0000 |
| parents | b9d05eb35488 |
| children | 166bece5922c |
| files | src/testApp.cpp |
| diffstat | 1 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testApp.cpp Fri Nov 04 22:56:48 2011 +0000 +++ b/src/testApp.cpp Fri Nov 04 23:23:13 2011 +0000 @@ -109,8 +109,10 @@ */ - secondFileName = "../../../data/sound/Bach_short2.wav"; - +// secondFileName = "../../../data/sound/Bach_short2.wav"; + + secondFileName = "/Users/andrew/Documents/work/programming/of_preRelease_v0061_osx_FAT/apps/my_openFrameworks/chromaReader13audioTimeWarp3/bin/data/sound/Bach_short2.wav"; + loadSecondAudio(secondFileName);//i.e. load same as first file @@ -1315,6 +1317,9 @@ void testApp::loadNewAudio(string soundFileName){ + //need to add in clear fns +// tw.chromaMatrix.clear(); +// tw.firstEnergyVector.clear(); loadedAudio.loadSound(soundFileName); playingAudio = &loadedAudio; @@ -1322,8 +1327,8 @@ const char *infilename = soundFileName.c_str() ; loadLibSndFile(infilename); - loadFirstAudioFile(); - +// loadFirstAudioFile(); + processAudioToDoubleMatrix(&tw.chromaMatrix, &tw.firstEnergyVector); audioPlaying = false; } @@ -1365,7 +1370,7 @@ */ processAudioToDoubleMatrix(&tw.secondMatrix, &tw.secondEnergyVector);//dptr, e ptr);//chromaMatrix); - tw.createCombinedMatrix(tw.secondMatrix, tw.secondEnergyVector, &tw.secondChromaEnergyMatrix); +// tw.createCombinedMatrix(tw.secondMatrix, tw.secondEnergyVector, &tw.secondChromaEnergyMatrix); }