X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=blobdiff_plain;f=libmain.cpp;h=4da65018065dbbc4f672e9072785cf1453528e0b;hp=6bfb4a1f2f9a923d3da7ebed37d1e48a85a6dadf;hb=8147414afbaa81c103ea00937444eb930cc56d38;hpb=291a1d946f17383cf3a93ea3e37170e704a49ed0
diff --git a/libmain.cpp b/libmain.cpp
index 6bfb4a1..4da6501 100644
--- a/libmain.cpp
+++ b/libmain.cpp
@@ -6,11 +6,20 @@
Centre for Digital Music, Queen Mary, University of London.
This file copyright 2006 Chris Cannam.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of the
- License, or (at your option) any later version. See the file
- COPYING included with this distribution for more information.
+ This file is part of vamp-aubio-plugins.
+
+ vamp-aubio is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ vamp-aubio is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with aubio. If not, see .
*/
@@ -23,6 +32,8 @@
#include "plugins/Tempo.h"
#include "plugins/Silence.h"
#include "plugins/Mfcc.h"
+#include "plugins/MelEnergy.h"
+#include "plugins/SpecDesc.h"
static Vamp::PluginAdapter onsetAdapter;
static Vamp::PluginAdapter pitchAdapter;
@@ -30,6 +41,8 @@ static Vamp::PluginAdapter notesAdapter;
static Vamp::PluginAdapter tempoAdapter;
static Vamp::PluginAdapter silenceAdapter;
static Vamp::PluginAdapter mfccAdapter;
+static Vamp::PluginAdapter melenergyAdapter;
+static Vamp::PluginAdapter specdescAdapter;
const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
unsigned int index)
@@ -43,6 +56,8 @@ const VampPluginDescriptor *vampGetPluginDescriptor(unsigned int vampApiVersion,
case 3: return tempoAdapter.getDescriptor();
case 4: return silenceAdapter.getDescriptor();
case 5: return mfccAdapter.getDescriptor();
+ case 6: return melenergyAdapter.getDescriptor();
+ case 7: return specdescAdapter.getDescriptor();
default: return 0;
}
}