X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finclude%2Fmidi-item.hh;h=5b3eaf6a1a5484e4e8e858124ca7236ed5a91079;hb=bd0a24bfd5968f97b8817f6e1442403a35ebcdf6;hp=c422e04db8d655094a37aa95b24405c5407bab1d;hpb=1a66290a98e7de8d6d41485b5b71a9f7e1fe35c7;p=lilypond.git

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index c422e04db8..5b3eaf6a1a 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,7 +1,7 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1998 Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #ifndef MIDI_ITEM_HH
@@ -9,6 +9,8 @@
 
 #include "string.hh"
 #include "lily-proto.hh"
+#include "proto.hh"
+#include "plist.hh"
 #include "virtual-methods.hh"
 #include "moment.hh"
 
@@ -18,142 +20,159 @@
   Maybe use base classes for RIFF files?
  */
 struct Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_item (Audio_item* audio_item_l); 
-    static String i2varint_str (int i);
-    void output (Midi_stream* midi_stream_l) const;
-    virtual String str() const = 0;
+  
+  Midi_item (Audio_item* audio_item_l); 
+  virtual ~Midi_item ();
+  static String i2varint_str (int i);
+  virtual String str () const = 0;
 
-    Audio_item* audio_item_l_;
-    int channel_i_;
+  Audio_item* audio_item_l_;
+  int channel_i_;
 
 private:
-    Midi_item (Midi_item const&);
-    Midi_item& operator =( Midi_item const&);
+  Midi_item (Midi_item const&);
+  Midi_item& operator = ( Midi_item const&);
+};
+
+/**
+  timed MIDI event
+ */
+struct Midi_event
+{
+  Midi_event (Moment delta_mom, Midi_item* mitem_l);
+  ~Midi_event ();
+  Moment delta_mom_;
+  Midi_item* mitem_p_;
+  String str () const;
 };
 
 /**
   variable sized MIDI data
  */
 struct Midi_chunk : Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_chunk();
+  
+  Midi_chunk ();
 
-    void add (String str);
-    void set (String header_str, String data_str, String footer_str);
-    virtual String str() const;
+  void set (String header_str, String data_str, String footer_str);
+  virtual String str () const;
+  virtual String data_str () const;
 
 private:
-    String data_str_;
-    String footer_str_;
-    String header_str_;
+  String data_str_;
+  String footer_str_;
+  String header_str_;
 };
 
 struct Midi_duration : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_duration (Real seconds_f);
+  
+  Midi_duration (Real seconds_f);
 
-    virtual String str() const;
-    Real seconds_f_;
+  virtual String str () const;
+  Real seconds_f_;
 };
 
 struct Midi_header : Midi_chunk {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-
-    Midi_header (int format_i, int tracks_i, int clocks_per_4_i);
+  
 
+  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);
+  
+  Midi_instrument (int channel_i, String instrument_str);
 
-    virtual String str() const;
-    String instrument_str_;
+  virtual String str () const;
+  String instrument_str_;
 };
                                       
 
 struct Midi_key : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_key (Audio_item* audio_item_l);
+  
+  Midi_key (Audio_item* audio_item_l);
 	
-    virtual String str() const;
+  virtual String str () const;
 };
 
-struct Midi_meter : Midi_item {
+struct Midi_time_signature : Midi_item {
 
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_meter (Audio_item* audio_item_l); 
   
-    virtual String str() const;
-    int clocks_per_1_i_;
+  Midi_time_signature (Audio_item* audio_item_l); 
+  
+  virtual String str () const;
+  int clocks_per_1_i_;
 };
 
 /**
   Turn a note on (blond).
  */
 struct Midi_note : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_note (Audio_item* audio_item_l); 
+  
+  Midi_note (Audio_item* audio_item_l); 
 
-    Moment duration() const;
-    int pitch_i() const;
-    virtual String str() const;
+  Moment duration () const;
+  int pitch_i () const;
+  virtual String str () const;
 
-    int const c0_pitch_i_c_ = 60;
-    Byte dynamic_byte_;
+  static int const c0_pitch_i_c_ = 60;
+  Byte dynamic_byte_;
 };
 
 /**
   Turn a note off (dark).
  */
 struct Midi_note_off : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_note_off (Midi_note* midi_note_l); 
+  
+  Midi_note_off (Midi_note*); 
 
-    int pitch_i() const;
-    virtual String str() const;
+  int pitch_i () const;
+  virtual String str () const;
 
-    Byte aftertouch_byte_;
+  Byte aftertouch_byte_;
 };
 
 struct Midi_text : Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
+  
     
-    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);
+  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);
     
-    virtual String str() const;
+  virtual String str () const;
 
-    Type type_;
-    String text_str_;
+  Type type_;
+  String text_str_;
 };
 
 struct Midi_tempo : Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_tempo (int per_minute_4_i);
-    Midi_tempo (Audio_item* audio_item_l); 
   
-    virtual String str() const;
+  Midi_tempo (int per_minute_4_i);
+  Midi_tempo (Audio_item* audio_item_l); 
+  
+  virtual String str () const;
 
-    int per_minute_4_i_;
+  int per_minute_4_i_;
 };
 
 struct Midi_track : Midi_chunk {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    int number_i_;
+  
+  int number_i_;
+  Pointer_list<Midi_event*> event_p_list_;
     
-    Midi_track();
+  Midi_track ();
+  ~Midi_track ();
 
-    void add (int delta_time_i, String event);
-    void add (Moment delta_time_moment, Midi_item* mitem_l);
+  void add (Moment delta_time_mom, Midi_item* mitem_l);
+  virtual String data_str () const;
+
+private:
+  // copy trap
+  Midi_track (Midi_track const&);
 };
 
 #endif // MIDI_ITEM_HH