Fix some bugs in the dynamic engraver and PostScript backend

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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 6c102329185e891c4f8934e55ddf9c691744339c..ba3f2c0a9a61e0b76bc0dc438626ce0eae82b006 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--2005 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1997--2006 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.
@@ -18,15 +18,17 @@
 class Midi_item
 {
 public:
+  DECLARE_CLASSNAME(Midi_item);
   Midi_item ();
   virtual ~Midi_item ();
+  virtual char const *name () const;
 
   /// factory
   static Midi_item *get_midi (Audio_item *a);
 
-  static String i2varint_string (int i);
+  static string i2varint_string (int i);
 
-  virtual String to_string () const = 0;
+  virtual string to_string () const = 0;
 
   int channel_;
 };
@@ -41,7 +43,7 @@ public:
 
   Moment delta_mom_;
   Midi_item *midi_;
-  String to_string () const;
+  string to_string () const;
 };
 
 /**
@@ -50,14 +52,15 @@ public:
 class Midi_chunk : public Midi_item
 {
 public:
-  void set (String header_string, String data_string, String footer_string);
-  virtual String to_string () const;
-  virtual String data_string () const;
+  void set (string header_string, string data_string, string footer_string);
+  virtual string to_string () const;
+  virtual string data_string () const;
+  DECLARE_CLASSNAME(Midi_chunk);
 
 private:
-  String data_string_;
-  String footer_string_;
-  String header_string_;
+  string data_string_;
+  string footer_string_;
+  string header_string_;
 };
 
 class Midi_duration : public Midi_item
@@ -65,13 +68,15 @@ class Midi_duration : public Midi_item
 public:
   Midi_duration (Real seconds_f);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
   Real seconds_;
 };
 
 class Midi_header : public Midi_chunk
 {
 public:
+    DECLARE_CLASSNAME(Midi_header);
+
   Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
 };
 
@@ -83,7 +88,8 @@ class Midi_instrument : public Midi_item
 public:
   Midi_instrument (Audio_instrument *);
 
-  virtual String to_string () const;
+  DECLARE_CLASSNAME(Midi_instrument);
+  virtual string to_string () const;
 
   Audio_instrument *audio_;
 };
@@ -92,8 +98,9 @@ class Midi_key : public Midi_item
 {
 public:
   Midi_key (Audio_key *);
+  DECLARE_CLASSNAME(Midi_key);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_key *audio_;
 };
@@ -102,8 +109,9 @@ class Midi_time_signature : public Midi_item
 {
 public:
   Midi_time_signature (Audio_time_signature *);
+  DECLARE_CLASSNAME(Midi_time_signature);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_time_signature *audio_;
   int clocks_per_1_;
@@ -116,11 +124,12 @@ class Midi_note : public Midi_item
 {
 public:
   Midi_note (Audio_note *);
+  DECLARE_CLASSNAME(Midi_note);
 
   Moment get_length () const;
   int get_pitch () const;
   int get_fine_tuning () const;
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_note *audio_;
 
@@ -135,8 +144,9 @@ class Midi_note_off : public Midi_note
 {
 public:
   Midi_note_off (Midi_note *);
+  DECLARE_CLASSNAME(Midi_note_off);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Midi_note *on_;
   Byte aftertouch_byte_;
@@ -150,10 +160,11 @@ public:
       TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
       MARKER, CUE_POINT
     };
+  DECLARE_CLASSNAME(Midi_text);
 
   Midi_text (Audio_text *);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_text *audio_;
 };
@@ -162,8 +173,9 @@ class Midi_dynamic : public Midi_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
+  DECLARE_CLASSNAME(Midi_dynamic);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_dynamic *audio_;
 };
@@ -172,8 +184,9 @@ class Midi_piano_pedal : public Midi_item
 {
 public:
   Midi_piano_pedal (Audio_piano_pedal *);
+  DECLARE_CLASSNAME(Midi_piano_pedal);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_piano_pedal *audio_;
 };
@@ -182,8 +195,9 @@ class Midi_tempo : public Midi_item
 {
 public:
   Midi_tempo (Audio_tempo *);
+  DECLARE_CLASSNAME(Midi_tempo);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_tempo *audio_;
 };
@@ -192,16 +206,18 @@ class Midi_track : public Midi_chunk
 {
 public:
   int number_;
+  DECLARE_CLASSNAME(Midi_track);
 
   /*
     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;
+  virtual string data_string () const;
 };
 
 #endif // MIDI_ITEM_HH