add 2007 to (c) year.

[lilypond.git] / lily / include / midi-item.hh

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 178ddedbf5bc792f1592633f94c57660bdbdb605..9dd942bffcdd8b0f8f56ed7fdb5eb737dd32c5c1 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,14 +1,14 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c) 1997--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #ifndef MIDI_ITEM_HH
 #define MIDI_ITEM_HH
 
-#include "cons.hh"
 #include "audio-item.hh"
+#include "std-vector.hh"
 
 /**
    Any piece of midi information.
@@ -29,8 +29,16 @@ public:
   static string i2varint_string (int i);
 
   virtual string to_string () const = 0;
+};
 
+class Midi_channel_item : public Midi_item
+{
+public:
   int channel_;
+  DECLARE_CLASSNAME(Midi_channel_item);
+  Midi_channel_item ();
+  virtual const char *name () const { return "Midi_channel_item"; }
+  virtual ~Midi_channel_item ();
 };
 
 /**
@@ -83,7 +91,7 @@ public:
 /**
    Change instrument event
 */
-class Midi_instrument : public Midi_item
+class Midi_instrument : public Midi_channel_item
 {
 public:
   Midi_instrument (Audio_instrument *);
@@ -120,20 +128,21 @@ public:
 /**
    Turn a note on.
 */
-class Midi_note : public Midi_item
+class Midi_note : public Midi_channel_item
 {
 public:
   Midi_note (Audio_note *);
   DECLARE_CLASSNAME(Midi_note);
 
   Moment get_length () const;
-  int get_pitch () const;
+  int get_semitone_pitch () const;
   int get_fine_tuning () const;
   virtual string to_string () const;
 
   Audio_note *audio_;
 
-  static int const c0_pitch_i_ = 60;
+  
+  static int const c0_pitch_ = 60;
   Byte dynamic_byte_;
 };
 
@@ -169,7 +178,7 @@ public:
   Audio_text *audio_;
 };
 
-class Midi_dynamic : public Midi_item
+class Midi_dynamic : public Midi_channel_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
@@ -180,7 +189,7 @@ public:
   Audio_dynamic *audio_;
 };
 
-class Midi_piano_pedal : public Midi_item
+class Midi_piano_pedal : public Midi_channel_item
 {
 public:
   Midi_piano_pedal (Audio_piano_pedal *);
@@ -211,9 +220,10 @@ public:
   /*
     Compensate for starting grace notes.
   */
-  Cons_list<Midi_event> event_p_list_;
+  vector<Midi_event*> events_;
 
   Midi_track ();
+  ~Midi_track ();
 
   void add (Moment delta_time_mom, Midi_item *midi);
   virtual string data_string () const;