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

diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh
index b8e1a6b8b4..ae5d0998b8 100644
--- a/lily/include/midi-item.hh
+++ b/lily/include/midi-item.hh
@@ -1,125 +1,170 @@
-//
-//  midiitem.hh -- part of GNU LilyPond
-//
-//  copyright 1997 Jan Nieuwenhuizen <jan@digicash.com>
+/*
+  midi-item.hh -- declare Midi items
+
+  (c) 1997--2008 Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #ifndef MIDI_ITEM_HH
 #define MIDI_ITEM_HH
-#include "string.hh"
-#include "lily-proto.hh"
-
-struct Midi_item {
-    static String i2varint_str( int i );
-    virtual void output_midi( Midi_stream& midi_stream_r ) const;
-    virtual String str() const = 0;
-    NAME_MEMBERS();
+
+#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?
+*/
+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;
 };
 
-struct Midi_key : public Midi_item {
-    Midi_key( int accidentals_i, int minor_i );
-	
-    virtual String str() const;
-    NAME_MEMBERS();
-    /* *************** */
-    int accidentals_i_;
-    int minor_i_;
+class Midi_channel_item : public Midi_item
+{
+public:
+  int channel_;
+  DECLARE_CLASSNAME(Midi_channel_item);
+  Midi_channel_item ();
 };
 
-struct Midi_note : public Midi_item {
-    /**
-      Generate a note-event on a channel pitch.
+class Midi_duration : public Midi_item
+{
+public:
+  Midi_duration (Real seconds_f);
+
+  virtual string to_string () const;
+  Real seconds_;
+};
+
+
+/**
+   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_;
+};
 
-      @param #melreq_l# is the pitch. 
-     */
-    Midi_note( Melodic_req* melreq_l, int channel_i, bool on_b );
-    NAME_MEMBERS();
-    virtual String str() const;
+class Midi_key : public Midi_item
+{
+public:
+  Midi_key (Audio_key *);
+  DECLARE_CLASSNAME(Midi_key);
 
-    /* *************** */
-    int const c0_pitch_i_c_ = 60;
-    Byte dynamic_byte_;
+  virtual string to_string () const;
 
-    int channel_i_;
-    int on_b_;
-    int pitch_i_;
+  Audio_key *audio_;
 };
 
-struct Midi_duration : public Midi_item {
-    Midi_duration( Real seconds_f );
+class Midi_time_signature : public Midi_item
+{
+public:
+  Midi_time_signature (Audio_time_signature *);
+  DECLARE_CLASSNAME(Midi_time_signature);
+
+  virtual string to_string () const;
 
-    virtual String str() const;
-    NAME_MEMBERS();
-    /* *************** */
-    Real seconds_f_;
+  Audio_time_signature *audio_;
+  int clocks_per_1_;
 };
 
-struct Midi_chunk : Midi_item {
-    Midi_chunk();
-
-    void add( String str );
-    void set( String header_str, String data_str, String footer_str );
-    virtual String str() const;
-    NAME_MEMBERS();
-private:
-    String data_str_;
-    String footer_str_;
-    String header_str_;
+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_;
+
+  
+  static int const c0_pitch_ = 60;
+  Byte dynamic_byte_;
 };
 
-struct Midi_header : Midi_chunk {
-    /* *************** */
-    Midi_header( int format_i, int tracks_i, int clocks_per_4_i );
-    NAME_MEMBERS();
+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_;
 };
 
-struct Midi_text : Midi_item {
-    
-    enum Type { 
-	TEXT = 1, COPYRIGHT, TRACK_NAME, INSTRUMENT_NAME, LYRIC, 
-	MARKER, CUE_POINT
+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 );
-    NAME_MEMBERS();
-    virtual String str() const;
-    /* *************** */
-    Type type_;
-    String text_str_;
-    
-};
+  DECLARE_CLASSNAME(Midi_text);
 
-struct Midi_tempo : Midi_item {
-    Midi_tempo( int per_minute_4_i );
-    NAME_MEMBERS();
+  Midi_text (Audio_text *);
 
-    virtual String str() const;
-    /* *************** */
+  virtual string to_string () const;
 
-    int per_minute_4_i_;
+  Audio_text *audio_;
 };
 
-struct Midi_time : Midi_item {
+class Midi_dynamic : public Midi_channel_item
+{
+public:
+  Midi_dynamic (Audio_dynamic *);
+  DECLARE_CLASSNAME(Midi_dynamic);
+
+  virtual string to_string () const;
+
+  Audio_dynamic *audio_;
+};
 
-    Midi_time( int num_i, int den_i, int clocks_per_1_i );
-    NAME_MEMBERS();
+class Midi_piano_pedal : public Midi_channel_item
+{
+public:
+  Midi_piano_pedal (Audio_piano_pedal *);
+  DECLARE_CLASSNAME(Midi_piano_pedal);
 
-    virtual String str() const;
+  virtual string to_string () const;
 
-    /* *************** */
-    int num_i_;
-    int den_i_;
-    int clocks_per_1_i_;
+  Audio_piano_pedal *audio_;
 };
 
-struct Midi_track : Midi_chunk {
-    int number_i_;
-    /* *************** */
-    Midi_track( );
-    NAME_MEMBERS();
+class Midi_tempo : public Midi_item
+{
+public:
+  Midi_tempo (Audio_tempo *);
+  DECLARE_CLASSNAME(Midi_tempo);
+
+  virtual string to_string () const;
 
-    void add( int delta_time_i, String event );
-//	void add( Moment delta_time_moment, Midi_item& mitem_r );
-    void add( Moment delta_time_moment, Midi_item* mitem_l );
+  Audio_tempo *audio_;
 };
 
-#endif // MIDI_ITEM_HH //
 
+
+#endif // MIDI_ITEM_HH