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 a4fc034ed11a1cc9b8ef0868d8a302d333883642..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.
@@ -26,11 +26,19 @@ public:
   /// 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;
+};
 
+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 ();
 };
 
 /**
@@ -43,7 +51,7 @@ public:
 
   Moment delta_mom_;
   Midi_item *midi_;
-  String to_string () const;
+  string to_string () const;
 };
 
 /**
@@ -52,15 +60,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
@@ -68,7 +76,7 @@ class Midi_duration : public Midi_item
 public:
   Midi_duration (Real seconds_f);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
   Real seconds_;
 };
 
@@ -83,13 +91,13 @@ public:
 /**
    Change instrument event
 */
-class Midi_instrument : public Midi_item
+class Midi_instrument : public Midi_channel_item
 {
 public:
   Midi_instrument (Audio_instrument *);
 
   DECLARE_CLASSNAME(Midi_instrument);
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_instrument *audio_;
 };
@@ -100,7 +108,7 @@ public:
   Midi_key (Audio_key *);
   DECLARE_CLASSNAME(Midi_key);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_key *audio_;
 };
@@ -111,7 +119,7 @@ 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_;
@@ -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;
+  virtual string to_string () const;
 
   Audio_note *audio_;
 
-  static int const c0_pitch_i_ = 60;
+  
+  static int const c0_pitch_ = 60;
   Byte dynamic_byte_;
 };
 
@@ -146,7 +155,7 @@ 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_;
@@ -164,29 +173,29 @@ public:
 
   Midi_text (Audio_text *);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_text *audio_;
 };
 
-class Midi_dynamic : public Midi_item
+class Midi_dynamic : public Midi_channel_item
 {
 public:
   Midi_dynamic (Audio_dynamic *);
   DECLARE_CLASSNAME(Midi_dynamic);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   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 *);
   DECLARE_CLASSNAME(Midi_piano_pedal);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_piano_pedal *audio_;
 };
@@ -197,7 +206,7 @@ public:
   Midi_tempo (Audio_tempo *);
   DECLARE_CLASSNAME(Midi_tempo);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
   Audio_tempo *audio_;
 };
@@ -211,12 +220,13 @@ 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;
+  virtual string data_string () const;
 };
 
 #endif // MIDI_ITEM_HH