Mercurial > hg > silvet

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch preshift
author Chris Cannam
date Tue, 08 Apr 2014 13:30:43 +0100
parents eec530c4300d
children 97b77e7cb94c
comparison
equal deleted inserted replaced
53:9e2d1f6cd43a 56:4fa3ea96eb65
3 #ifndef SILVET_DATA_TEMPLATES_H 3 #ifndef SILVET_DATA_TEMPLATES_H
4 #define SILVET_DATA_TEMPLATES_H 4 #define SILVET_DATA_TEMPLATES_H
5 5
6 /* note: intended to parse as both C and C++ */ 6 /* note: intended to parse as both C and C++ */
7 7
8 #define SILVET_TEMPLATE_NOTE_COUNT 88 8 #define SILVET_TEMPLATE_COUNT 10 /* Number of instruments */
9 #define SILVET_TEMPLATE_HEIGHT 545 9 #define SILVET_TEMPLATE_NOTE_COUNT 88 /* Number of notes per instrument */
10 #define SILVET_TEMPLATE_COUNT 13 10 #define SILVET_TEMPLATE_HEIGHT 545 /* Frequency bins per template */
11 #define SILVET_TEMPLATE_MAX_SHIFT 2 /* Zeros at either end of template */
12 #define SILVET_TEMPLATE_SIZE 549 /* Height + 2 * max shift space */
11 13
12 typedef struct { 14 typedef struct {
13 const char *name; 15 const char *name;
14 int lowest; 16 int lowest;
15 int highest; 17 int highest;
16 float data[SILVET_TEMPLATE_NOTE_COUNT][SILVET_TEMPLATE_HEIGHT]; 18 float data[SILVET_TEMPLATE_NOTE_COUNT][SILVET_TEMPLATE_SIZE];
17 } silvet_template_t; 19 } silvet_template_t;
18 20
19 static int silvet_templates_lowest_note = 15; 21 static int silvet_templates_lowest_note = 15;
20 static int silvet_templates_highest_note = 72; 22 static int silvet_templates_highest_note = 72;
21 23
28 #include "horn.h" 30 #include "horn.h"
29 #include "oboe.h" 31 #include "oboe.h"
30 #include "tenorsax.h" 32 #include "tenorsax.h"
31 #include "violin.h" 33 #include "violin.h"
32 #include "piano-maps-SptkBGCl.h" 34 #include "piano-maps-SptkBGCl.h"
33 #include "piano1.h"
34 #include "piano2.h"
35 #include "piano3.h"
36 }; 35 };
37 36
38 #endif 37 #endif