From 95438ba901cb65c119ff9e93b7f1e5080b213ac2 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:33:09 +0000
Subject: [PATCH] lilypond-0.0.34

---
 hdr/midiitem.hh | 70 ++++++++++++++++++++++++++++---------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/hdr/midiitem.hh b/hdr/midiitem.hh
index 9527c53375..d30e6448fc 100644
--- a/hdr/midiitem.hh
+++ b/hdr/midiitem.hh
@@ -5,62 +5,72 @@
 
 #ifndef MIDI_ITEM_HH
 #define MIDI_ITEM_HH
+#include "string.hh"
+#include "proto.hh"
 
 struct Midi_item {
-	/* *************** */
-	static String int2varlength_str( int i );
-	virtual void output_midi( Midi_stream& midi_stream_r );
-	virtual String str() = 0;
+    /* *************** */
+    static String int2varlength_str( int i );
+    virtual void output_midi( Midi_stream& midi_stream_r );
+    virtual String str() = 0;
 };
 
 struct Midi_note : public Midi_item {
-	/* *************** */
-	int const c0_pitch_i_c_ = 60;
-	Midi_note( Melodic_req* melreq_l, int channel_i, bool on_bo );
+    /* *************** */
+    int const c0_pitch_i_c_ = 60;
+    Byte dynamic_byte_;
+
+    /**
+      Generate a note-event on a channel pitch.
+
+      @param #melreq_l# the pitch. If null, then output a silent C
+      #on_b# turn on?
+     */
+    Midi_note( Melodic_req* melreq_l, int channel_i, bool on_b );
 	
-	virtual String str();
+    virtual String str();
 
-	int channel_i_;
-	int on_bo_;
-	int pitch_i_;
+    int channel_i_;
+    int on_b_;
+    int pitch_i_;
 };
 
 struct Midi_duration : public Midi_item {
-	/* *************** */
-	Midi_duration( Real seconds_f );
+    /* *************** */
+    Midi_duration( Real seconds_f );
 
-	virtual String str();
+    virtual String str();
 
-	Real seconds_f_;
+    Real seconds_f_;
 };
 
 struct Midi_chunk : Midi_item {
-	/* *************** */
-	Midi_chunk();
+    /* *************** */
+    Midi_chunk();
 
-	void add( String str );
-	void set( String header_str, String data_str, String footer_str );
-	virtual String str();
+    void add( String str );
+    void set( String header_str, String data_str, String footer_str );
+    virtual String str();
 
 private:
-	String data_str_;
-	String footer_str_;
-	String header_str_;
+    String data_str_;
+    String footer_str_;
+    String header_str_;
 };
 
 struct Midi_header : Midi_chunk {
-	/* *************** */
-	Midi_header( int format_i, int tracks_i, int tempo_i );
+    /* *************** */
+    Midi_header( int format_i, int tracks_i, int tempo_i );
 };
 
 struct Midi_track : Midi_chunk {
-	/* *************** */
-	int number_i_;
-	Midi_track( int number_i );
+    /* *************** */
+    int number_i_;
+    Midi_track( int number_i );
 
-	void add( int delta_time_i, String event );
+    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 );
+    void add( Moment delta_time_moment, Midi_item* mitem_l );
 };
 
 #endif // MIDI_ITEM_HH //
-- 
2.39.5