comparison libmain.cpp @ 23:1ae8041ae31b

Merge from branch "track"
author Chris Cannam
date Thu, 05 Jul 2012 08:29:20 +0100
parents 10dfd77951bf
children c70ebf24b419
comparison
equal deleted inserted replaced
7:47355877a58d 23:1ae8041ae31b
2 2
3 #include <vamp/vamp.h> 3 #include <vamp/vamp.h>
4 #include <vamp-sdk/PluginAdapter.h> 4 #include <vamp-sdk/PluginAdapter.h>
5 5
6 #include "SimpleCepstrum.h" 6 #include "SimpleCepstrum.h"
7 #include "CepstrumPitchTracker.h"
7 8
8 static Vamp::PluginAdapter<SimpleCepstrum> cepPluginAdapter; 9 static Vamp::PluginAdapter<SimpleCepstrum> cepPluginAdapter;
10 static Vamp::PluginAdapter<CepstrumPitchTracker> cepitchPluginAdapter;
9 11
10 const VampPluginDescriptor * 12 const VampPluginDescriptor *
11 vampGetPluginDescriptor(unsigned int version, unsigned int index) 13 vampGetPluginDescriptor(unsigned int version, unsigned int index)
12 { 14 {
13 if (version < 1) return 0; 15 if (version < 1) return 0;
14 16
15 switch (index) { 17 switch (index) {
16 case 0: return cepPluginAdapter.getDescriptor(); 18 case 0: return cepPluginAdapter.getDescriptor();
19 case 1: return cepitchPluginAdapter.getDescriptor();
17 default: return 0; 20 default: return 0;
18 } 21 }
19 } 22 }
20 23
21 24