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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index c422e04db8..a3cea87e61 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,159 +1,170 @@
 /*
   midi-item.hh -- declare Midi items
 
-  (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
- */
+  (c) 1997--2007 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_ITEM_HH
 #define MIDI_ITEM_HH
 
-#include "string.hh"
-#include "lily-proto.hh"
-#include "virtual-methods.hh"
-#include "moment.hh"
+#include "audio-item.hh"
+#include "std-vector.hh"
 
+string int2midi_varint_string (int i);
+  
 /**
-  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); 
-    static String i2varint_str (int i);
-    void output (Midi_stream* midi_stream_l) const;
-    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&);
+   Any piece of midi information.
+
+   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;
+
+  static Midi_item *get_midi (Audio_item *a);
+
+
+  virtual string to_string () const = 0;
 };
 
-/**
-  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_;
+class Midi_channel_item : public Midi_item
+{
+public:
+  int channel_;
+  DECLARE_CLASSNAME(Midi_channel_item);
+  Midi_channel_item ();
 };
 
-struct Midi_duration : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_duration (Real seconds_f);
+class Midi_duration : public Midi_item
+{
+public:
+  Midi_duration (Real seconds_f);
 
-    virtual String str() const;
-    Real seconds_f_;
+  virtual string to_string () const;
+  Real seconds_;
 };
 
-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
+*/
+class Midi_instrument : public Midi_channel_item
+{
+public:
+  Midi_instrument (Audio_instrument *);
+
+  DECLARE_CLASSNAME(Midi_instrument);
+  virtual string to_string () const;
 
+  Audio_instrument *audio_;
 };
 
-/**
-  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_;
+class Midi_key : public Midi_item
+{
+public:
+  Midi_key (Audio_key *);
+  DECLARE_CLASSNAME(Midi_key);
+
+  virtual string to_string () const;
+
+  Audio_key *audio_;
 };
-                                      
 
-struct Midi_key : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_key (Audio_item* audio_item_l);
-	
-    virtual String str() const;
+class Midi_time_signature : public Midi_item
+{
+public:
+  Midi_time_signature (Audio_time_signature *);
+  DECLARE_CLASSNAME(Midi_time_signature);
+
+  virtual string to_string () const;
+
+  Audio_time_signature *audio_;
+  int clocks_per_1_;
 };
 
-struct Midi_meter : Midi_item {
+class Midi_note : public Midi_channel_item
+{
+public:
+  Midi_note (Audio_note *);
+  DECLARE_CLASSNAME(Midi_note);
+
+  int get_semitone_pitch () const;
+  int get_fine_tuning () const;
+  virtual string to_string () const;
+
+  Audio_note *audio_;
 
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_meter (Audio_item* audio_item_l); 
   
-    virtual String str() const;
-    int clocks_per_1_i_;
+  static int const c0_pitch_ = 60;
+  Byte dynamic_byte_;
 };
 
-/**
-  Turn a note on (blond).
- */
-struct Midi_note : public Midi_item {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    Midi_note (Audio_item* audio_item_l); 
-
-    Moment duration() const;
-    int pitch_i() const;
-    virtual String str() const;
-
-    int const c0_pitch_i_c_ = 60;
-    Byte dynamic_byte_;
+class Midi_note_off : public Midi_note
+{
+public:
+  Midi_note_off (Midi_note *);
+  DECLARE_CLASSNAME(Midi_note_off);
+
+  virtual string to_string () const;
+
+  Midi_note *on_;
+  Byte aftertouch_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); 
+class Midi_text : public Midi_item
+{
+public:
+  enum Type
+    {
+      TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC,
+      MARKER, CUE_POINT
+    };
+  DECLARE_CLASSNAME(Midi_text);
+
+  Midi_text (Audio_text *);
 
-    int pitch_i() const;
-    virtual String str() const;
+  virtual string to_string () const;
 
-    Byte aftertouch_byte_;
+  Audio_text *audio_;
 };
 
-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);
-    
-    virtual String str() const;
+class Midi_dynamic : public Midi_channel_item
+{
+public:
+  Midi_dynamic (Audio_dynamic *);
+  DECLARE_CLASSNAME(Midi_dynamic);
+
+  virtual string to_string () const;
 
-    Type type_;
-    String text_str_;
+  Audio_dynamic *audio_;
 };
 
-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;
+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;
 
-    int per_minute_4_i_;
+  Audio_piano_pedal *audio_;
 };
 
-struct Midi_track : Midi_chunk {
-    DECLARE_MY_RUNTIME_TYPEINFO;
-    int number_i_;
-    
-    Midi_track();
+class Midi_tempo : public Midi_item
+{
+public:
+  Midi_tempo (Audio_tempo *);
+  DECLARE_CLASSNAME(Midi_tempo);
 
-    void add (int delta_time_i, String event);
-    void add (Moment delta_time_moment, Midi_item* mitem_l);
+  virtual string to_string () const;
+
+  Audio_tempo *audio_;
 };
 
+
+
 #endif // MIDI_ITEM_HH