changed from durations to start style

svn path=/trunk/externals/frankenstein/; revision=4124

1 files changed, 24 insertions, 29 deletions

diff --git a/common.h b/common.h
index 02ac024..b969ed1 100755
--- a/common.h
+++ b/common.h
@@ -12,7 +12,6 @@ typedef struct t_note_event t_note_event;
 

 typedef struct t_note

 {

-	unsigned short int played; // 0 if is a rest, 1 if played

 	unsigned short int chord; // 0 if is not a chord (strong) note, 1 if it is

 	unsigned short int diatonic; // 0 if is a note not belonging to this tonality

 	int interval; // semitones from prefious note

@@ -26,7 +25,8 @@ struct t_note_event
 {

 	unsigned short int voice;

 	t_note note;

-	t_duration duration;

+	t_duration start; // moment of the noteon event

+	t_duration duration; // duration of this event

 	t_note_event *previous; // this is a list, link to the previous element

 	t_note_event *next;  // this is a list, link to the next element

 };

@@ -41,8 +41,8 @@ typedef struct t_rhythm_event t_rhythm_event;
 struct t_rhythm_event

 {

 	unsigned short int voice;

-	unsigned short int played; // 0 if is a rest, 1 if played

-	t_duration duration;

+	t_duration start; // moment of the noteon event

+	t_duration duration; // duration of this event

 	t_rhythm_event *previous; // this is a list, link to the previous element

 	t_rhythm_event *next;  // this is a list, link to the next element

 };

@@ -60,14 +60,18 @@ typedef struct t_rhythm_memory_node t_rhythm_memory_node;
 // graph node

 struct t_rhythm_memory_node

 {

-	t_duration duration;

+	// start is implicit:

+	// this is in an array

+	// use int2duration and duration2int 

+	// against the index in the array to get its value

+	unsigned short int first; // how many times this has been the first event

+	unsigned short int weight; // how many times this has been an event

 	t_rhythm_memory_arc *arcs; // the list of arcs to other nodes

 } ;

 // graph arc: related to t_rhythm_memory_node

 struct t_rhythm_memory_arc

 {

-	unsigned short int weight;

-	t_rhythm_memory_node *to_node; // the target of this link (arc)

+	unsigned short int to_node_index; // the target of this link (arc)

 	t_rhythm_memory_arc *next_arc; // next link in the list

 } ;

 // it will be arranged in a heap list.. ?

@@ -78,6 +82,7 @@ static unsigned short int possible_denominators[] = {1,2,3,4,6,8,12,16,18,24,32}
 // this defines a space for rhythms, variations, transitions and representations

 typedef struct t_rhythm_memory_representation t_rhythm_memory_representation;

 typedef struct t_rhythm_memory_element t_rhythm_memory_element;

+typedef struct t_rhythm_memory_first_node t_rhythm_memory_first_node;

 // element of a list of rhythms

 struct t_rhythm_memory_element

 {

@@ -92,6 +97,7 @@ struct t_rhythm_memory_representation
 {

 	t_rhythm_memory_element *main_rhythm;

 	t_rhythm_memory_node *transitions;

+	unsigned short int max_weight;

 	t_rhythm_memory_element *similar_rhythms;

 } ;

 

@@ -99,10 +105,6 @@ struct t_rhythm_memory_representation
 

 // ----------- rhythm manipolation functions

 

-// TODO: 

-// - from data structures to lists of numbers and vice versa

-// - from a (voice, duration) representation to (voice, start, duration) and viceversa

-

 // converts from integer to duration: used to know this table index

 // what corresponds in terms of duration

 t_duration int2duration(int n);

@@ -121,31 +123,23 @@ float duration2float(t_duration duration);
 // --- rhythms creation and manupulation functions

 

 // set the first beat of a sequence

-void setFirstBeat(t_rhythm_event **firstEvent, unsigned short int voice, float fduration, unsigned short int played);

+// this also creates a new rhythm

+void setFirstBeat(t_rhythm_event **firstEvent, unsigned short int voice, float fstart, float fduration);

 

 //adds a beat at the end of this list

-void concatenateBeat(t_rhythm_event *currentEvent, unsigned short int voice, float fduration, unsigned short int played);

+void concatenateBeat(t_rhythm_event *currentEvent, unsigned short int voice, float fstart, float fduration);

 

 // used to free the memory allocated by this list

 void freeBeats(t_rhythm_event *currentEvent);

 

-// change rhythm description protocol

-

-// from (duration) to (start) style

-// the (start) style is a list of noteon events, the order is not important

-void swap_rhythm_to_start(t_rhythm_event *oldStyle, t_rhythm_event **newStyle);

-

-// from (start) to (duration)

-// the (duration) style is a linked list of duration of both notes or rests, the order is important

-void swap_rhythm_to_duration(t_rhythm_event *oldStyle, t_rhythm_event **newStyle);

 

 // --- memory representation of rhythms

 

 // add an arc to this node

-void add_t_rhythm_memory_arc(t_rhythm_memory_node *srcNode, t_rhythm_memory_node *dstNode);

+void add_t_rhythm_memory_arc(t_rhythm_memory_node *srcNode, unsigned short int dstNode);

 

-// initialize this representation, allocates memory for the pointers

-void init_rhythm_memory_representation(t_rhythm_memory_representation *this_rep);

+// create and initialize this representation, allocate memory for the pointers

+void create_rhythm_memory_representation(t_rhythm_memory_representation **this_rep);

 

 // add a new rhythm in the list of similar rhythms related to one main rhythm

 void add_similar_rhythm(t_rhythm_memory_representation *this_rep, t_rhythm_event *new_rhythm);

@@ -153,17 +147,18 @@ void add_similar_rhythm(t_rhythm_memory_representation *this_rep, t_rhythm_event
 // free the array with pointers and lists

 void free_memory_representation(t_rhythm_memory_representation *this_rep);

 

-// functions needed to fill and use the memory table

-

+// compares this rhythm to this representation

+// and tells you how close it is to it

+// TODO !!!!!!!!!!!!!!!!!!

 

 

 // -------- notes manipulation functions

 

 // set the first beat of a sequence

-void setFirstNote(t_note_event **firstEvent, unsigned short int voice, float fduration, t_note note);

+void setFirstNote(t_note_event **firstEvent, unsigned short int voice, float fstart, float fduration, t_note note);

 

 //adds a beat at the end of this list

-void concatenateNote(t_note_event *currentEvent, unsigned short int voice, float fduration, t_note note);

+void concatenateNote(t_note_event *currentEvent, unsigned short int voice, float fstart, float fduration, t_note note);

 

 // used to free the memory allocated by this list

 void freeNotes(t_note_event *currentEvent);