Refactoring.

TP_MUSIQUE_C/Compilation.ml

@@ -15,8 +15,8 @@ let wait t s = match s with
 
 let rec compile_melodie i s vol = match s with
   | [] -> []
-  | (d, Note h) :: r -> (0, NoteOn(h,i,vol)) :: (duree d, NoteOff(h,i,vol)) :: compile_melodie i r vol 
-  | (d, Silence) :: r -> wait (duree d) (compile_melodie i r vol) ;; 
+  | (Note h,d) :: r -> (0, NoteOn(h,i,vol)) :: (duree d, NoteOff(h,i,vol)) :: compile_melodie i r vol 
+  | (Silence,d) :: r -> wait (duree d) (compile_melodie i r vol) ;; 
 
 (** L'entier indique le tempo en BPM. *)
 let rec compile : int -> Solfege.partition -> SimpleMIDI.sequence =

TP_MUSIQUE_C/Exemple.ml

@@ -5,10 +5,24 @@ open SimpleMIDI
 open Compilation
 
 
-let ma_partition1 = (Flute, (Noire, Note 60) :: (Noire, Note 64) :: (Noire, Note 67) :: []) ;;
+let ma_partition1 = 
+  (Flute, 
+   (Note 60, Noire) 
+   :: (Note 64, Noire) 
+   :: (Note 67, Noire) 
+   :: []) ;;
 
-let ma_partition2 = (Guitare, (Croche, Note 60) :: (Croche, Note 60) :: (Croche, Note 64) :: (Croche, Note 64) ::(Croche, Note 67)::(Croche, Note 67) :: []) ;;
+let ma_partition2 = 
+  (Guitare, 
+   (Note 60, Croche) 
+   :: (Note 60, Croche) 
+   :: (Note 64, Croche) 
+   :: (Note 64, Croche) 
+   :: (Note 67, Croche)
+   :: (Note 67, Croche)
+   :: []) ;;
 
 
 let _ = write_sequence (compile 80 ma_partition1) "test_solo.mid";;
+
 let _ = write_sequence (compile_avec_accompagnement 80 ma_partition1 ma_partition2) "test_acc.mid";;

TP_MUSIQUE_C/Solfege.ml

@@ -7,12 +7,10 @@ type valeur = Noire | Croche
 
 type signe = Note of hauteur | Silence
 
-type melodie = (valeur * signe) list
+type melodie = (signe * valeur) list
 
 type instrument = Piano | Violon | Guitare | GuitareSat | Basse | Flute | Harmonica
 
-
-
 type partition = instrument * melodie