X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=ae5d0998b81fd5105e13b62a84a3098cac6a61f0;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=e61b5ed7753ba731d896e0aaea96150ad1f8df10;hpb=7e72a1e50e94a7f9738d62599de79fe7745f600c;p=lilypond.git

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index e61b5ed775..ae5d0998b8 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,66 +1,42 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c) 1997--2004 Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_ITEM_HH
 #define MIDI_ITEM_HH
 
-#include "cons.hh"
-#include "string.hh"
-#include "lily-proto.hh"
-#include "moment.hh"
 #include "audio-item.hh"
+#include "std-vector.hh"
 
+string int2midi_varint_string (int i);
+  
 /**
-  Any piece of midi information.
+   Any piece of midi information.
 
-  Maybe use base classes for RIFF files?
- */
+   Maybe use base classes for RIFF files?
+*/
 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);
-
-  virtual String to_string () const = 0;
-
-  int channel_;
-};
+  static Midi_item *get_midi (Audio_item *a);
 
-/**
-  timed MIDI event
- */
-class Midi_event
-{
-public:
-  Midi_event (Moment delta_mom, Midi_item* midi);
 
-  Moment delta_mom_;
-  Midi_item* midi_;
-  String to_string () const;
+  virtual string to_string () const = 0;
 };
 
-/**
-  variable sized MIDI data
- */
-class Midi_chunk : public Midi_item
+class Midi_channel_item : 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;
-
-private:
-  String data_string_;
-  String footer_string_;
-  String header_string_;
+  int channel_;
+  DECLARE_CLASSNAME(Midi_channel_item);
+  Midi_channel_item ();
 };
 
 class Midi_duration : public Midi_item
@@ -68,143 +44,127 @@ 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:
-  Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
-};
 
 /**
-  Change instrument event
- */
-class Midi_instrument : public Midi_item
+   Change instrument event
+*/
+class Midi_instrument : public Midi_channel_item
 {
 public:
-  Midi_instrument (Audio_instrument*);
+  Midi_instrument (Audio_instrument *);
 
-  virtual String to_string () const;
+  DECLARE_CLASSNAME(Midi_instrument);
+  virtual string to_string () const;
 
-  Audio_instrument* audio_;
+  Audio_instrument *audio_;
 };
-                                      
 
 class Midi_key : public Midi_item
 {
 public:
-  Midi_key (Audio_key*);
-	
-  virtual String to_string () const;
+  Midi_key (Audio_key *);
+  DECLARE_CLASSNAME(Midi_key);
 
-  Audio_key* audio_;
+  virtual string to_string () const;
+
+  Audio_key *audio_;
 };
 
 class Midi_time_signature : public Midi_item
 {
 public:
-  Midi_time_signature (Audio_time_signature*);
-  
-  virtual String to_string () const;
+  Midi_time_signature (Audio_time_signature *);
+  DECLARE_CLASSNAME(Midi_time_signature);
 
-  Audio_time_signature* audio_;
+  virtual string to_string () const;
+
+  Audio_time_signature *audio_;
   int clocks_per_1_;
 };
 
-/**
-  Turn a note on.
- */
-class Midi_note : public Midi_item
+class Midi_note : public Midi_channel_item
 {
 public:
-  Midi_note (Audio_note*);
+  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_;
+  Audio_note *audio_;
 
-  static int const c0_pitch_i_ = 60;
+  
+  static int const c0_pitch_ = 60;
   Byte dynamic_byte_;
 };
 
-/**
-  Turn a note off 
- */
 class Midi_note_off : public Midi_note
 {
 public:
-  Midi_note_off (Midi_note*); 
+  Midi_note_off (Midi_note *);
+  DECLARE_CLASSNAME(Midi_note_off);
 
-  virtual String to_string () const;
+  virtual string to_string () const;
 
-  Midi_note* on_;
+  Midi_note *on_;
   Byte aftertouch_byte_;
 };
 
 class Midi_text : public Midi_item
 {
 public:
-  enum Type { 
-    TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
-    MARKER, CUE_POINT
-  };
+  enum Type
+    {
+      TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
+      MARKER, CUE_POINT
+    };
+  DECLARE_CLASSNAME(Midi_text);
 
-  Midi_text (Audio_text*);
-    
-  virtual String to_string () const;
+  Midi_text (Audio_text *);
 
-  Audio_text* audio_;
+  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*);
-  
-  virtual String to_string () const;
+  Midi_dynamic (Audio_dynamic *);
+  DECLARE_CLASSNAME(Midi_dynamic);
 
-  Audio_dynamic* audio_;
+  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*);
-  
-  virtual String to_string () const;
+  Midi_piano_pedal (Audio_piano_pedal *);
+  DECLARE_CLASSNAME(Midi_piano_pedal);
 
-  Audio_piano_pedal* audio_;
+  virtual string to_string () const;
+
+  Audio_piano_pedal *audio_;
 };
 
 class Midi_tempo : public Midi_item
 {
 public:
-  Midi_tempo (Audio_tempo*);
-  
-  virtual String to_string () const;
+  Midi_tempo (Audio_tempo *);
+  DECLARE_CLASSNAME(Midi_tempo);
 
-  Audio_tempo* audio_;
-};
+  virtual string to_string () const;
 
-class Midi_track : public Midi_chunk
-{
-public:
-  int number_;
+  Audio_tempo *audio_;
+};
 
-  /*
-    Compensate for starting grace notes.
-   */
-  Cons_list<Midi_event> event_p_list_;
-  
-  Midi_track ();
 
-  void add (Moment delta_time_mom, Midi_item* midi);
-  virtual String data_string () const;
-};
 
 #endif // MIDI_ITEM_HH