X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=51996efa7ff60c384c7e2ca39ab77f11b00b8f08;hb=73be5f6fe264e90a56e45f2d70129b133731188b;hp=61f374f6685cfc5da7fcd738ef5984176065eb35;hpb=3efa2752d62ffd4ae204e40a9cfa0fe3279deb66;p=lilypond.git

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 61f374f668..51996efa7f 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -7,11 +7,10 @@
 #ifndef MIDI_ITEM_HH
 #define MIDI_ITEM_HH
 
+#include "cons.hh"
 #include "string.hh"
 #include "lily-proto.hh"
 #include "proto.hh"
-#include "plist.hh"
-#include "virtual-methods.hh"
 #include "moment.hh"
 
 /**
@@ -20,7 +19,6 @@
   Maybe use base classes for RIFF files?
  */
 struct Midi_item {
-  
   Midi_item (Audio_item* audio_item_l); 
   virtual ~Midi_item ();
   static String i2varint_str (int i);
@@ -64,7 +62,6 @@ private:
 };
 
 struct Midi_duration : public Midi_item {
-  
   Midi_duration (Real seconds_f);
 
   virtual String str () const;
@@ -72,8 +69,6 @@ struct Midi_duration : public Midi_item {
 };
 
 struct Midi_header : Midi_chunk {
-  
-
   Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
 };
 
@@ -81,7 +76,6 @@ struct Midi_header : Midi_chunk {
   Change instrument event
  */
 struct Midi_instrument : public Midi_item {
-  
   Midi_instrument (int channel_i, String instrument_str);
 
   virtual String str () const;
@@ -90,15 +84,12 @@ struct Midi_instrument : public Midi_item {
                                       
 
 struct Midi_key : public Midi_item {
-  
   Midi_key (Audio_item* audio_item_l);
 	
   virtual String str () const;
 };
 
 struct Midi_time_signature : Midi_item {
-
-  
   Midi_time_signature (Audio_item* audio_item_l); 
   
   virtual String str () const;
@@ -109,7 +100,6 @@ struct Midi_time_signature : Midi_item {
   Turn a note on (blond).
  */
 struct Midi_note : public Midi_item {
-  
   Midi_note (Audio_item* audio_item_l); 
 
   Moment length_mom () const;
@@ -124,7 +114,6 @@ struct Midi_note : public Midi_item {
   Turn a note off (dark).
  */
 struct Midi_note_off : public Midi_item {
-  
   Midi_note_off (Midi_note*); 
 
   int pitch_i () const;
@@ -150,7 +139,6 @@ struct Midi_text : Midi_item {
 };
 
 struct Midi_tempo : Midi_item {
-  
   Midi_tempo (int per_minute_4_i);
   Midi_tempo (Audio_item* audio_item_l); 
   
@@ -160,10 +148,9 @@ struct Midi_tempo : Midi_item {
 };
 
 struct Midi_track : Midi_chunk {
-  
   int number_i_;
-  Pointer_list<Midi_event*> event_p_list_;
-    
+  Cons_list<Midi_event> event_p_list_;
+  
   Midi_track ();
   ~Midi_track ();