comparison libmain.cpp @ 90:e28946bf0b05

libmain.cpp: added SpecDesc
author Paul Brossier <piem@piem.org>
date Fri, 30 Jan 2015 18:21:30 +0100
parents 49663aa4f127
children f80b207ccd15
comparison
equal deleted inserted replaced
89:e9eb5753796b 90:e28946bf0b05
22 #include "plugins/Notes.h" 22 #include "plugins/Notes.h"
23 #include "plugins/Tempo.h" 23 #include "plugins/Tempo.h"
24 #include "plugins/Silence.h" 24 #include "plugins/Silence.h"
25 #include "plugins/Mfcc.h" 25 #include "plugins/Mfcc.h"
26 #include "plugins/MelEnergy.h" 26 #include "plugins/MelEnergy.h"
27 #include "plugins/SpecDesc.h"
27 28
28 static Vamp::PluginAdapter<Onset> onsetAdapter; 29 static Vamp::PluginAdapter<Onset> onsetAdapter;
29 static Vamp::PluginAdapter<Pitch> pitchAdapter; 30 static Vamp::PluginAdapter<Pitch> pitchAdapter;
30 static Vamp::PluginAdapter<Notes> notesAdapter; 31 static Vamp::PluginAdapter<Notes> notesAdapter;
31 static Vamp::PluginAdapter<Tempo> tempoAdapter; 32 static Vamp::PluginAdapter<Tempo> tempoAdapter;
32 static Vamp::PluginAdapter<Silence> silenceAdapter; 33 static Vamp::PluginAdapter<Silence> silenceAdapter;
33 static Vamp::PluginAdapter<Mfcc> mfccAdapter; 34 static Vamp::PluginAdapter<Mfcc> mfccAdapter;
34 static Vamp::PluginAdapter<MelEnergy> melenergyAdapter; 35 static Vamp::PluginAdapter<MelEnergy> melenergyAdapter;
36 static Vamp::PluginAdapter<SpecDesc> specdescAdapter;
35 37
36 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion, 38 const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
37 unsigned int index) 39 unsigned int index)
38 { 40 {
39 if (vampApiVersion < 2) return 0; 41 if (vampApiVersion < 2) return 0;
44 case 2: return notesAdapter.getDescriptor(); 46 case 2: return notesAdapter.getDescriptor();
45 case 3: return tempoAdapter.getDescriptor(); 47 case 3: return tempoAdapter.getDescriptor();
46 case 4: return silenceAdapter.getDescriptor(); 48 case 4: return silenceAdapter.getDescriptor();
47 case 5: return mfccAdapter.getDescriptor(); 49 case 5: return mfccAdapter.getDescriptor();
48 case 6: return melenergyAdapter.getDescriptor(); 50 case 6: return melenergyAdapter.getDescriptor();
51 case 7: return specdescAdapter.getDescriptor();
49 default: return 0; 52 default: return 0;
50 } 53 }
51 } 54 }
52 55