lilypond-0.0.34

diff --git a/hdr/inputscore.hh b/hdr/inputscore.hh
index 3b84d44fdb9b51d933c4f43ce24b39d1ea69d6ff..88cc1894a86f127ce74a1ea344b4f9987dadf744 100644 (file)
--- a/hdr/inputscore.hh
+++ b/hdr/inputscore.hh
@@ -24,7 +24,7 @@ struct Input_score {
     
     /// paper_, staffs_ and commands_ form the problem definition.
     Paperdef *paper_p_;
-    Mididef* midi_p_;
+    Midi_def* midi_p_;
     IPointerList<Input_staff*> staffs_;
 
     Input_music * score_wide_music_p_;
@@ -37,7 +37,7 @@ struct Input_score {
     ~Input_score();
     /// construction
     void set(Paperdef*);
-    void set(Mididef* midi_p);
+    void set(Midi_def* midi_p);
     void print() const;
     Score*parse();
     void set(Input_music*);

diff --git a/hdr/mididef.hh b/hdr/mididef.hh
index a2efdbecd0d30bef762a072b806f514c30825409..9a24fa51ffcd579c5939f0fb7d37cb48c0cfc1dd 100644 (file)
--- a/hdr/mididef.hh
+++ b/hdr/mididef.hh
@@ -17,16 +17,16 @@
 
 /** 
  */
-struct Mididef {
+struct Midi_def {
     /// output file name
     String outfile_str_;
 
     /// duration of whole note
     Real whole_seconds_f_;
 
-    Mididef();
-    Mididef(Mididef const& midi_c_r);
-    ~Mididef();
+    Midi_def();
+    Midi_def(Midi_def const& midi_c_r);
+    ~Midi_def();
 
     Real duration_to_seconds_f(Moment);
     int get_tempo_i( Moment moment );

diff --git a/src/mididef.cc b/src/mididef.cc
index 56ee59e0b7e0e3aded497460d901facec1ff0301..2c7bf7a7a794f8abb0c2fa1ea5e95371e009c7c6 100644 (file)
--- a/src/mididef.cc
+++ b/src/mididef.cc
@@ -16,24 +16,24 @@
 //     destructor
 //     routines, alphasorted
 
-Mididef::Mididef()
+Midi_def::Midi_def()
 {
     set_tempo( Moment( 1, 4 ), 60 );
     outfile_str_ = "lelie.midi"; 
 }
 
-Mididef::Mididef( Mididef const& midi_c_r )
+Midi_def::Midi_def( Midi_def const& midi_c_r )
 {
     whole_seconds_f_ = midi_c_r.whole_seconds_f_;
     outfile_str_ = midi_c_r.outfile_str_;
 }
 
-Mididef::~Mididef()
+Midi_def::~Midi_def()
 {
 }
 
 Real
-Mididef::duration_to_seconds_f( Moment moment )
+Midi_def::duration_to_seconds_f( Moment moment )
 {
     if (!moment)
        return 0;
@@ -42,13 +42,13 @@ Mididef::duration_to_seconds_f( Moment moment )
 }
 
 int
-Mididef::get_tempo_i( Moment moment )
+Midi_def::get_tempo_i( Moment moment )
 {
     return Moment( whole_seconds_f_ ) * Moment( 60 ) * moment;
 }
 
 void
-Mididef::print() const
+Midi_def::print() const
 {
 #ifndef NPRINT
     mtor << "Midi {4/min: " << Real( 60 ) / ( whole_seconds_f_ * 4 );
@@ -58,7 +58,7 @@ Mididef::print() const
 }
 
 void
-Mididef::set_tempo( Moment moment, int count_per_minute_i )
+Midi_def::set_tempo( Moment moment, int count_per_minute_i )
 {
     whole_seconds_f_ = Moment( count_per_minute_i ) / Moment( 60 ) / moment;
 }