From 64d6de56068584a090e555abf49a16d6bdf97696 Mon Sep 17 00:00:00 2001
From: Jamie Bullock <jamie@postlude.co.uk>
Date: Sun, 21 Jan 2007 14:40:23 +0000
Subject: Finished the essentials of descriptors.c

---
 xtract/libxtract.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'xtract/libxtract.h')

diff --git a/xtract/libxtract.h b/xtract/libxtract.h
index 51561cd..a78e239 100644
--- a/xtract/libxtract.h
+++ b/xtract/libxtract.h
@@ -112,6 +112,12 @@ enum features_ {
     HARMONIC_SPECTRUM
 };
 
+/** \brief Enumeration of feature initialisation functions */
+enum feature_init_ {
+    INIT_MFCC = 100,
+    INIT_BARK
+};
+
 /** \brief Enumeration of feature types */
 enum feature_types_ {
     SCALAR,
@@ -146,14 +152,20 @@ enum spectrum_ {
 /** \brief Enumeration of data types*/
 typedef enum type_ {
     FLOAT,
+    FLOATARRAY,
     INT,
     MEL_FILTER
 } t_type;
 
 /** \brief Enumeration of units*/
 typedef enum unit_ {
-    HERTZ,
-    DBFS
+    /* NONE, ANY */
+    HERTZ = 2,
+    ANY_AMPLITUDE_HERTZ,
+    DBFS,
+    DBFS_HERTZ,
+    PERCENT,
+    SONE
 } t_unit;
 
 /** \brief Boolean */
@@ -217,6 +229,7 @@ typedef struct _function_descriptor {
 
     t_bool is_scalar;
 
+    /* The result.<> entries in descritors.c need to be checked */
     union {
 
 	struct {
-- 
cgit v1.2.3