plugins/Onset.cpp: add default mode

[vamp-aubio-plugins.git] / plugins / Types.h

diff --git a/plugins/Types.h b/plugins/Types.h
index aa642b0..4fcd6fe 100644 (file)
--- a/plugins/Types.h
+++ b/plugins/Types.h
@@ -5,18 +5,34 @@
 
     Centre for Digital Music, Queen Mary, University of London.
     This file copyright 2012 Queen Mary, University of London.
-    
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
 #ifndef _ONSET_TYPE_H_
 #define _ONSET_TYPE_H_
 
+/** silence unused parameter warning by adding an attribute */
+#if defined(__GNUC__)
+#define UNUSED __attribute__((unused))
+#else
+#define UNUSED
+#endif
+
 // Note: the enum values in this header are ordered to match the Vamp
 // plugin parameter values in earlier versions of this plugin set, to
 // avoid breaking stored parameter settings that use the parameter's
@@ -31,11 +47,25 @@ enum OnsetType {
     OnsetPhase,
     OnsetKL,
     OnsetMKL,
-    OnsetSpecFlux // new in 0.4!
+    OnsetSpecFlux, // new in 0.4!
+    OnsetDefault   // new in 0.5
 };
 
 extern const char *getAubioNameForOnsetType(OnsetType t);
 
+enum SpecDescType {
+    SpecDescFlux,
+    SpecDescCentroid,
+    SpecDescSpread,
+    SpecDescSkeweness,
+    SpecDescKurtosis,
+    SpecDescSlope,
+    SpecDescDecrease,
+    SpecDescRolloff
+};
+
+extern const char *getAubioNameForSpecDescType(SpecDescType t);
+
 enum PitchType {
     PitchYin,
     PitchMComb,
@@ -45,8 +75,6 @@ enum PitchType {
 };
 
 extern const char *getAubioNameForPitchType(PitchType t);
-    
 
 #endif
 
-