Mercurial > hg > multitrack-audio-matcher
diff src/RecordedMultitrackAudio.cpp @ 10:cbadb9d05d29
Using timestamps for the scrolling alignment time
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Sat, 04 Feb 2012 19:59:27 +0000 |
| parents | bc62266af280 |
| children | 780def3a1f36 |
line wrap: on
line diff
--- a/src/RecordedMultitrackAudio.cpp Fri Feb 03 17:53:14 2012 +0000 +++ b/src/RecordedMultitrackAudio.cpp Sat Feb 04 19:59:27 2012 +0000 @@ -13,7 +13,16 @@ void RecordedMultitrackAudio::loadTestAudio(){ - const char *infilename = "../../../data/sound/LiveDues/kick_liveDues.wav"; +// const char *kickfilename = "../../../data/sound/LiveDues/kick_liveDues.wav"; +// const char *bassfilename = "../../../data/sound/LiveDues/bass_upsideLive.wav"; +// const char *snarefilename = "../../../data/sound/LiveDues/snare_liveDues.wav"; + + const char *kickfilename = "../../../data/sound/DiamondMatch1/kick_bip.wav"; + const char *bassfilename = "../../../data/sound/DiamondMatch1/bass_bip.wav"; + const char *snarefilename = "../../../data/sound/DiamondMatch1/snare_bip.wav"; + + + //"../../../data/sound/basicClavScale.wav"; //LoadedAudioHolder lah; @@ -26,7 +35,7 @@ //the above code using lah has problem that it deletes objects once out of the scope of testApp.setup() //when lah is in theory no longer used - something like that possible? - at least pointers to onset detection seem deleted loadedAudioPtr = new LoadedAudioHolder(); - loadedAudioPtr->loadAudioFile(infilename); + loadedAudioPtr->loadAudioFile(kickfilename); // loadedAudioFiles.push_back(*loadedAudioPtr); loadedAudioFiles[0] = *loadedAudioPtr; @@ -39,19 +48,17 @@ printf("BEFORE LOADING 1\n"); printInfo(); - infilename = "../../../data/sound/LiveDues/bass_upsideLive.wav"; - loadedAudioPtr = new LoadedAudioHolder; - loadedAudioPtr->loadAudioFile(infilename); + loadedAudioPtr->loadAudioFile(bassfilename); // loadedAudioFiles.push_back(*loadedAudioPtr); loadedAudioFiles[1] = *loadedAudioPtr; loadedAudioFiles[1].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight, 1, trackScreenHeight); loadedAudioFiles[1].setTrackType(1); - infilename = "../../../data/sound/LiveDues/snare_liveDues.wav"; + loadedAudioPtr = new LoadedAudioHolder; - loadedAudioPtr->loadAudioFile(infilename); + loadedAudioPtr->loadAudioFile(snarefilename); // loadedAudioFiles.push_back(*loadedAudioPtr); loadedAudioFiles[2] = *loadedAudioPtr; loadedAudioFiles[2].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight*2, 1, trackScreenHeight);