comparison libmain.cpp @ 92:3602e755b696

* Add the Adaptive Spectrogram plugin -- but it isn't working correctly yet. Also, when it does work, it will need to be refactored out into the qm-dsp library
author Chris Cannam <c.cannam@qmul.ac.uk>
date Fri, 27 Feb 2009 10:45:10 +0000
parents f4a2f5aa743c
children e51152b7ee06
comparison
equal deleted inserted replaced
91:93f7edb0564b 92:3602e755b696
18 #include "plugins/KeyDetect.h" 18 #include "plugins/KeyDetect.h"
19 #include "plugins/MFCCPlugin.h" 19 #include "plugins/MFCCPlugin.h"
20 #include "plugins/SegmenterPlugin.h" 20 #include "plugins/SegmenterPlugin.h"
21 #include "plugins/SimilarityPlugin.h" 21 #include "plugins/SimilarityPlugin.h"
22 #include "plugins/BarBeatTrack.h" 22 #include "plugins/BarBeatTrack.h"
23 #include "plugins/AdaptiveSpectrogram.h"
23 24
24 static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter; 25 static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter;
25 static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter; 26 static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter;
26 static Vamp::PluginAdapter<ChromagramPlugin> chromagramPluginAdapter; 27 static Vamp::PluginAdapter<ChromagramPlugin> chromagramPluginAdapter;
27 static Vamp::PluginAdapter<ConstantQSpectrogram> constantQAdapter; 28 static Vamp::PluginAdapter<ConstantQSpectrogram> constantQAdapter;
29 static Vamp::PluginAdapter<KeyDetector> keyDetectorAdapter; 30 static Vamp::PluginAdapter<KeyDetector> keyDetectorAdapter;
30 static Vamp::PluginAdapter<MFCCPlugin> mfccPluginAdapter; 31 static Vamp::PluginAdapter<MFCCPlugin> mfccPluginAdapter;
31 static Vamp::PluginAdapter<SegmenterPlugin> segmenterPluginAdapter; 32 static Vamp::PluginAdapter<SegmenterPlugin> segmenterPluginAdapter;
32 static Vamp::PluginAdapter<SimilarityPlugin> similarityPluginAdapter; 33 static Vamp::PluginAdapter<SimilarityPlugin> similarityPluginAdapter;
33 static Vamp::PluginAdapter<BarBeatTracker> barBeatTrackPluginAdapter; 34 static Vamp::PluginAdapter<BarBeatTracker> barBeatTrackPluginAdapter;
35 static Vamp::PluginAdapter<AdaptiveSpectrogram> adaptiveSpectrogramAdapter;
34 36
35 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion, 37 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
36 unsigned int index) 38 unsigned int index)
37 { 39 {
38 if (vampApiVersion < 1) return 0; 40 if (vampApiVersion < 1) return 0;
46 case 5: return keyDetectorAdapter.getDescriptor(); 48 case 5: return keyDetectorAdapter.getDescriptor();
47 case 6: return segmenterPluginAdapter.getDescriptor(); 49 case 6: return segmenterPluginAdapter.getDescriptor();
48 case 7: return similarityPluginAdapter.getDescriptor(); 50 case 7: return similarityPluginAdapter.getDescriptor();
49 case 8: return mfccPluginAdapter.getDescriptor(); 51 case 8: return mfccPluginAdapter.getDescriptor();
50 case 9: return barBeatTrackPluginAdapter.getDescriptor(); 52 case 9: return barBeatTrackPluginAdapter.getDescriptor();
53 case 10: return adaptiveSpectrogramAdapter.getDescriptor();
51 default: return 0; 54 default: return 0;
52 } 55 }
53 } 56 }
54 57