diff libmain.cpp @ 31:2c175adf8736

Pull out pitch tracker from vamp-simple-cepstrum to its own project

--- a/libmain.cpp	Fri Jul 13 21:35:29 2012 +0100
+++ b/libmain.cpp	Thu Jul 19 13:13:23 2012 +0100
@@ -1,13 +1,33 @@
 /* -*- c-basic-offset: 4 indent-tabs-mode: nil -*-  vi:set ts=8 sts=4 sw=4: */
+/*
+    This file is Copyright (c) 2012 Chris Cannam
+  
+    Permission is hereby granted, free of charge, to any person
+    obtaining a copy of this software and associated documentation
+    files (the "Software"), to deal in the Software without
+    restriction, including without limitation the rights to use, copy,
+    modify, merge, publish, distribute, sublicense, and/or sell copies
+    of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be
+    included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+    ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+    CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
 
 #include <vamp/vamp.h>
 #include <vamp-sdk/PluginAdapter.h>
 
-#include "SimpleCepstrum.h"
-#include "CepstrumPitchTracker.h"
+#include "CepstralPitchTracker.h"
 
-static Vamp::PluginAdapter<SimpleCepstrum> cepPluginAdapter;
-static Vamp::PluginAdapter<CepstrumPitchTracker> cepitchPluginAdapter;
+static Vamp::PluginAdapter<CepstralPitchTracker> cepitchPluginAdapter;
 
 const VampPluginDescriptor *
 vampGetPluginDescriptor(unsigned int version, unsigned int index)
@@ -15,7 +35,6 @@
     if (version < 1) return 0;
 
     switch (index) {
-    case  0: return cepPluginAdapter.getDescriptor();
     case  1: return cepitchPluginAdapter.getDescriptor();
     default: return 0;
     }