X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=2dac25e853e644727c6ed67b4c79b5118b0cf69a;hb=beb54099cf241daac01cc026dad15211bf19c618;hp=526504f14efadfb6a439207b57607df887646028;hpb=ae9dfbb452eff2e47f1330854a12d73161fcb677;p=lilypond.git

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 526504f14e..2dac25e853 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,58 +1,59 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1997--2000 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #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"
+#include "audio-item.hh"
 
 /**
   Any piece of midi information.
 
   Maybe use base classes for RIFF files?
  */
-struct Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_item (Audio_item* audio_item_l); 
+class Midi_item
+{
+public:
+  Midi_item ();
   virtual ~Midi_item ();
+
+  /// factory
+  static Midi_item* midi_p (Audio_item* a);
+
   static String i2varint_str (int i);
+
   virtual String str () const = 0;
 
-  Audio_item* audio_item_l_;
   int channel_i_;
-
-private:
-  Midi_item (Midi_item const&);
-  Midi_item& operator = ( Midi_item const&);
 };
 
 /**
   timed MIDI event
  */
-struct Midi_event
+class Midi_event
 {
-  Midi_event (Moment delta_mom, Midi_item* mitem_l);
-  ~Midi_event ();
+public:
+  Midi_event (Moment delta_mom, Midi_item* midi_l);
+
   Moment delta_mom_;
-  Midi_item* mitem_p_;
+  Midi_item* midi_p_;
   String str () const;
 };
 
 /**
   variable sized MIDI data
  */
-struct Midi_chunk : Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_chunk ();
-
+class Midi_chunk : public Midi_item
+{
+public:
   void set (String header_str, String data_str, String footer_str);
   virtual String str () const;
   virtual String data_str () const;
@@ -63,116 +64,143 @@ private:
   String header_str_;
 };
 
-struct Midi_duration : public Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
+class Midi_duration : public Midi_item
+{
+public:
   Midi_duration (Real seconds_f);
 
   virtual String str () const;
   Real seconds_f_;
 };
 
-struct Midi_header : Midi_chunk {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-
+class Midi_header : public Midi_chunk
+{
+public:
   Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
 };
 
 /**
   Change instrument event
  */
-struct Midi_instrument : public Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_instrument (int channel_i, String instrument_str);
+class Midi_instrument : public Midi_item
+{
+public:
+  Midi_instrument (Audio_instrument*);
 
   virtual String str () const;
-  String instrument_str_;
+
+  Audio_instrument* audio_l_;
 };
                                       
 
-struct Midi_key : public Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_key (Audio_item* audio_item_l);
+class Midi_key : public Midi_item
+{
+public:
+  Midi_key (Audio_key*);
 	
   virtual String str () const;
-};
 
-struct Midi_time_signature : Midi_item {
+  Audio_key* audio_l_;
+};
 
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_time_signature (Audio_item* audio_item_l); 
+class Midi_time_signature : public Midi_item
+{
+public:
+  Midi_time_signature (Audio_time_signature*);
   
   virtual String str () const;
+
+  Audio_time_signature* audio_l_;
   int clocks_per_1_i_;
 };
 
 /**
-  Turn a note on (blond).
+  Turn a note on.
  */
-struct Midi_note : public Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_note (Audio_item* audio_item_l); 
+class Midi_note : public Midi_item
+{
+public:
+  Midi_note (Audio_note*);
 
-  Moment duration () const;
+  Moment length_mom () const;
   int pitch_i () const;
   virtual String str () const;
 
+  Audio_note* audio_l_;
+
   static int const c0_pitch_i_c_ = 60;
   Byte dynamic_byte_;
 };
 
 /**
-  Turn a note off (dark).
+  Turn a note off 
  */
-struct Midi_note_off : public Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
+class Midi_note_off : public Midi_note
+{
+public:
   Midi_note_off (Midi_note*); 
 
-  int pitch_i () const;
   virtual String str () const;
 
+  Midi_note* on_l_;
   Byte aftertouch_byte_;
 };
 
-struct Midi_text : Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-    
+class Midi_text : public Midi_item
+{
+public:
   enum Type { 
     TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
     MARKER, CUE_POINT
   };
-  Midi_text (Midi_text::Type type, String text_str);
-  Midi_text (Audio_item* audio_item_l);
+
+  Midi_text (Audio_text*);
     
   virtual String str () const;
 
-  Type type_;
-  String text_str_;
+  Audio_text* audio_l_;
+};
+
+class Midi_dynamic : public Midi_item
+{
+public:
+  Midi_dynamic (Audio_dynamic*);
+  
+  virtual String str () const;
+
+  Audio_dynamic* audio_l_;
+};
+
+class Midi_piano_pedal : public Midi_item
+{
+public:
+  Midi_piano_pedal (Audio_piano_pedal*);
+  
+  virtual String str () const;
+
+  Audio_piano_pedal* audio_l_;
 };
 
-struct Midi_tempo : Midi_item {
-  DECLARE_MY_RUNTIME_TYPEINFO;
-  Midi_tempo (int per_minute_4_i);
-  Midi_tempo (Audio_item* audio_item_l); 
+class Midi_tempo : public Midi_item
+{
+public:
+  Midi_tempo (Audio_tempo*);
   
   virtual String str () const;
 
-  int per_minute_4_i_;
+  Audio_tempo* audio_l_;
 };
 
-struct Midi_track : Midi_chunk {
-  DECLARE_MY_RUNTIME_TYPEINFO;
+class Midi_track : public Midi_chunk
+{
+public:
   int number_i_;
-  Pointer_list<Midi_event*> event_p_list_;
-    
+  Cons_list<Midi_event> event_p_list_;
+  
   Midi_track ();
-  ~Midi_track ();
 
-  void add (Moment delta_time_mom, Midi_item* mitem_l);
+  void add (Moment delta_time_mom, Midi_item* midi_l);
   virtual String data_str () const;
-
-private:
-  // copy trap
-  Midi_track (Midi_track const&);
 };
 
 #endif // MIDI_ITEM_HH