release: 0.1.7

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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index 369d4a48862a14ecb3312b4c51a4e4e9d1413166..4906f27ba865678dad30e26c1e803fdbb7571c1c 100644 (file)
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -9,6 +9,8 @@
 
 #include "string.hh"
 #include "lily-proto.hh"
+#include "virtual-methods.hh"
+#include "moment.hh"
 
 /**
   Any piece of midi information.
@@ -16,6 +18,7 @@
   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;
@@ -29,72 +32,104 @@ private:
     Midi_item& operator =( Midi_item const& );
 };
 
-struct Midi_key : public Midi_item {
-    Midi_key( Audio_item* audio_item_l );
-       
+/**
+  variable sized MIDI data
+ */
+struct Midi_chunk : Midi_item {
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Midi_chunk();
+
+    void add( String str );
+    void set( String header_str, String data_str, String footer_str );
+    virtual String str() const;
+
+private:
+    String data_str_;
+    String footer_str_;
+    String header_str_;
+};
+
+struct Midi_duration : public Midi_item {
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Midi_duration( 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 );
+
 };
 
 /**
   Change instrument event
  */
 struct Midi_instrument : public Midi_item {
+    DECLARE_MY_RUNTIME_TYPEINFO;
     Midi_instrument( int channel_i, String instrument_str );
 
     virtual String str() const;
     String instrument_str_;
 };
                                       
-struct Midi_note : public Midi_item {
-    /**
-      Generate a note-event on a channel.
-
-      @param #melreq_l# is the pitch. 
-     */
-    Midi_note( Audio_item* audio_item_l ); 
 
+struct Midi_key : public Midi_item {
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Midi_key( Audio_item* audio_item_l );
+       
     virtual String str() const;
-
-    /* *************** */
-    int const c0_pitch_i_c_ = 60;
-    bool on_b_;
-    Byte dynamic_byte_;
 };
 
-struct Midi_duration : public Midi_item {
-    Midi_duration( Real seconds_f );
+struct Midi_meter : Midi_item {
 
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Midi_meter( Audio_item* audio_item_l ); 
+  
     virtual String str() const;
-    /* *************** */
-    Real seconds_f_;
+    int clocks_per_1_i_;
 };
 
-struct Midi_chunk : Midi_item {
-    Midi_chunk();
+/**
+  Turn a note on (blond).
+ */
+struct Midi_note : public Midi_item {
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Midi_note( Audio_item* audio_item_l ); 
 
-    void add( String str );
-    void set( String header_str, String data_str, String footer_str );
+    Moment duration() const;
+    int pitch_i() const;
     virtual String str() const;
-private:
-    String data_str_;
-    String footer_str_;
-    String header_str_;
+
+    int const c0_pitch_i_c_ = 60;
+    Byte dynamic_byte_;
 };
 
-struct Midi_header : Midi_chunk {
-    /* *************** */
-    Midi_header( int format_i, int tracks_i, int clocks_per_4_i );
+/**
+  Turn a note off (dark).
+ */
+struct Midi_note_off : public Midi_item {
+    DECLARE_MY_RUNTIME_TYPEINFO;
+    Midi_note_off( Midi_note* midi_note_l ); 
+
+    int pitch_i() const;
+    virtual String str() const;
+
+    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( Audio_item* audio_item_l );
     Midi_text( Midi_text::Type type, String text_str );
-
+    Midi_text( Audio_item* audio_item_l );
+    
     virtual String str() const;
 
     Type type_;
@@ -102,24 +137,19 @@ struct Midi_text : Midi_item {
 };
 
 struct Midi_tempo : Midi_item {
-    Midi_tempo( Audio_item* audio_item_l ); 
+    DECLARE_MY_RUNTIME_TYPEINFO;
     Midi_tempo( int per_minute_4_i );
-
+    Midi_tempo( Audio_item* audio_item_l ); 
+  
     virtual String str() const;
 
     int per_minute_4_i_;
 };
 
-struct Midi_meter : Midi_item {
-    Midi_meter( Audio_item* audio_item_l ); 
-
-    virtual String str() const;
-    int clocks_per_1_i_;
-};
-
 struct Midi_track : Midi_chunk {
+    DECLARE_MY_RUNTIME_TYPEINFO;
     int number_i_;
-    /* *************** */
+    
     Midi_track();
 
     void add( int delta_time_i, String event );