comparison libmain.cpp @ 37:9ce0db4770a2

* work on integrating segmenter (not yet done)
author Chris Cannam <c.cannam@qmul.ac.uk>
date Wed, 09 Jan 2008 16:51:59 +0000
parents 3256bfa04ed8
children b9fb6dee85f7
comparison
equal deleted inserted replaced
36:5359ba489c0f 37:9ce0db4770a2
14 #include "plugins/OnsetDetect.h" 14 #include "plugins/OnsetDetect.h"
15 #include "plugins/ChromagramPlugin.h" 15 #include "plugins/ChromagramPlugin.h"
16 #include "plugins/ConstantQSpectrogram.h" 16 #include "plugins/ConstantQSpectrogram.h"
17 #include "plugins/TonalChangeDetect.h" 17 #include "plugins/TonalChangeDetect.h"
18 #include "plugins/KeyDetect.h" 18 #include "plugins/KeyDetect.h"
19 #include "plugins/SegmenterPlugin.h"
19 20
20 static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter; 21 static Vamp::PluginAdapter<BeatTracker> beatTrackerAdapter;
21 static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter; 22 static Vamp::PluginAdapter<OnsetDetector> onsetDetectorAdapter;
22 static Vamp::PluginAdapter<ChromagramPlugin> chromagramPluginAdapter; 23 static Vamp::PluginAdapter<ChromagramPlugin> chromagramPluginAdapter;
23 static Vamp::PluginAdapter<ConstantQSpectrogram> constantQAdapter; 24 static Vamp::PluginAdapter<ConstantQSpectrogram> constantQAdapter;
24 static Vamp::PluginAdapter<TonalChangeDetect> tonalChangeDetectorAdapter; 25 static Vamp::PluginAdapter<TonalChangeDetect> tonalChangeDetectorAdapter;
25 static Vamp::PluginAdapter<KeyDetector> keyDetectorAdapter; 26 static Vamp::PluginAdapter<KeyDetector> keyDetectorAdapter;
27 static Vamp::PluginAdapter<SegmenterPlugin> segmenterPluginAdapter;
26 28
27 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion, 29 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
28 unsigned int index) 30 unsigned int index)
29 { 31 {
30 if (vampApiVersion < 1) return 0; 32 if (vampApiVersion < 1) return 0;
34 case 1: return onsetDetectorAdapter.getDescriptor(); 36 case 1: return onsetDetectorAdapter.getDescriptor();
35 case 2: return chromagramPluginAdapter.getDescriptor(); 37 case 2: return chromagramPluginAdapter.getDescriptor();
36 case 3: return constantQAdapter.getDescriptor(); 38 case 3: return constantQAdapter.getDescriptor();
37 case 4: return tonalChangeDetectorAdapter.getDescriptor(); 39 case 4: return tonalChangeDetectorAdapter.getDescriptor();
38 case 5: return keyDetectorAdapter.getDescriptor(); 40 case 5: return keyDetectorAdapter.getDescriptor();
41 case 6: return segmenterPluginAdapter.getDescriptor();
39 default: return 0; 42 default: return 0;
40 } 43 }
41 } 44 }
42 45