Mercurial > hg > multitrack-audio-matcher
comparison src/RecordedMultitrackAudio.cpp @ 38:9c803369b229
working well tmp version
| author | Andrew N Robertson <andrew.robertson@eecs.qmul.ac.uk> |
|---|---|
| date | Tue, 24 Apr 2012 16:37:52 +0100 |
| parents | eb43b2a007ea |
| children | f5de07b4d733 |
comparison
equal
deleted
inserted
replaced
| 37:9806a4f22fd0 | 38:9c803369b229 |
|---|---|
| 165 //kick - track type 0 | 165 //kick - track type 0 |
| 166 //bass - type 1 | 166 //bass - type 1 |
| 167 //snare type 2 | 167 //snare type 2 |
| 168 if (channel >= 0 && channel <= 4){ | 168 if (channel >= 0 && channel <= 4){ |
| 169 loadedAudioPtr = new LoadedAudioHolder; | 169 loadedAudioPtr = new LoadedAudioHolder; |
| 170 //set tracktype before we do analysis | |
| 171 //so we dont do unnecessary chroma and pitch calculations | |
| 172 loadedAudioPtr->setTrackType(channel); | |
| 170 loadedAudioPtr->loadAudioFile(name); | 173 loadedAudioPtr->loadAudioFile(name); |
| 174 | |
| 171 loadedAudioFiles[channel] = *loadedAudioPtr; | 175 loadedAudioFiles[channel] = *loadedAudioPtr; |
| 172 loadedAudioFiles[channel].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight*channel, 1, trackScreenHeight); | 176 loadedAudioFiles[channel].fileLoader.onsetDetect.window.setToRelativeSize(0, trackScreenHeight*channel, 1, trackScreenHeight); |
| 173 loadedAudioFiles[channel].setTrackType(channel); | 177 //loadedAudioFiles[channel].setTrackType(channel); |
| 174 } | 178 } |
| 175 } | 179 } |
| 176 | 180 |
| 177 | 181 |
| 178 | 182 |