← Back to branch summary

~mr-unwell2006/mixxx/mixxx

« back to all changes in this revision

Viewing changes to mixxx/src/analyserqueue.cpp

  • Committer: Varun Jewalikar
  • Date: 2012-03-26 20:31:44 UTC
  • Revision ID: mr.unwell2006@gmail.com-20120326203144-i3l722he8id1l85j
Added key detection class to analyser queue

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/analyserqueue.cpp
14
14
#include "analyserrg.h"
15
15
#ifdef __VAMP__
16
16
#include "analyserbeats.h"
17
 
#include "analysergainvamp.h";
 
17
#include "analyserkey.h"
 
18
#include "analysergainvamp.h"
18
19
#include "vamp/vampanalyser.h"
19
20
#endif
20
21
 
210
211
    AnalyserQueue* ret = new AnalyserQueue();
211
212
 
212
213
#ifdef __TONAL__
213
 
    ret->addAnalyser(new TonalAnalyser());
 
214
    //ret->addAnalyser(new TonalAnalyser());
214
215
#endif
215
216
 
216
 
    ret->addAnalyser(new AnalyserWavesummary());
217
 
    ret->addAnalyser(new AnalyserWaveform());
 
217
   // ret->addAnalyser(new AnalyserWavesummary());
 
218
   // ret->addAnalyser(new AnalyserWaveform());
218
219
 
219
220
#ifdef __VAMP__
220
221
    VampAnalyser::initializePluginPaths();
221
222
    ret->addAnalyser(new AnalyserGainVamp(_config));
222
223
    ret->addAnalyser(new AnalyserBeats(_config));
223
 
    //ret->addAnalyser(new AnalyserVampKeyTest(_config));
 
224
    ret->addAnalyser(new AnalyserKey(_config));
224
225
#else
225
226
    ret->addAnalyser(new AnalyserBPM(_config));
226
227
    ret->addAnalyser(new AnalyserGain(_config));
236
237
    VampAnalyser::initializePluginPaths();
237
238
    ret->addAnalyser(new AnalyserGainVamp(_config));
238
239
    ret->addAnalyser(new AnalyserBeats(_config));
239
 
    //ret->addAnalyser(new AnalyserVampKeyTest(_config));
 
240
    ret->addAnalyser(new AnalyserKey(_config));
240
241
#else
241
242
    ret->addAnalyser(new AnalyserBPM(_config));
242
243
    ret->addAnalyser(new AnalyserGain(_config));