diff data/include/templates.h @ 56:4fa3ea96eb65

Merge from branch preshift

--- a/data/include/templates.h	Mon Apr 07 17:34:19 2014 +0100
+++ b/data/include/templates.h	Tue Apr 08 13:30:43 2014 +0100
@@ -5,15 +5,17 @@
 
 /* note: intended to parse as both C and C++ */
 
-#define SILVET_TEMPLATE_NOTE_COUNT 88
-#define SILVET_TEMPLATE_HEIGHT     545
-#define SILVET_TEMPLATE_COUNT      13
+#define SILVET_TEMPLATE_COUNT      10   /* Number of instruments */
+#define SILVET_TEMPLATE_NOTE_COUNT 88   /* Number of notes per instrument */ 
+#define SILVET_TEMPLATE_HEIGHT     545  /* Frequency bins per template */
+#define SILVET_TEMPLATE_MAX_SHIFT  2    /* Zeros at either end of template */ 
+#define SILVET_TEMPLATE_SIZE       549  /* Height + 2 * max shift space */ 
 
 typedef struct {
     const char *name;
     int lowest;
     int highest;
-    float data[SILVET_TEMPLATE_NOTE_COUNT][SILVET_TEMPLATE_HEIGHT];
+    float data[SILVET_TEMPLATE_NOTE_COUNT][SILVET_TEMPLATE_SIZE];
 } silvet_template_t;
 
 static int silvet_templates_lowest_note = 15;
@@ -30,9 +32,6 @@
 #include "tenorsax.h"
 #include "violin.h"
 #include "piano-maps-SptkBGCl.h"
-#include "piano1.h"
-#include "piano2.h"
-#include "piano3.h"
 };
 
 #endif