release: 0.1.8

[lilypond.git] / lily / midi-def.cc

diff --git a/lily/midi-def.cc b/lily/midi-def.cc
index 800c1e9cd17169d2b813f583c94f56b20f2e0685..95b3e25b0c49a665f35471b63567113cdf85967b 100644 (file)
--- a/lily/midi-def.cc
+++ b/lily/midi-def.cc
@@ -32,13 +32,13 @@ Midi_def::Midi_def()
     outfile_str_ = ""; 
     itrans_p_ = 0;
     // ugh
-    set_tempo( Moment( 1, 4 ), 60 );
+    set_tempo (Moment (1, 4), 60 );
 }
 
-Midi_def::Midi_def( Midi_def const& s )
+Midi_def::Midi_def (Midi_def const& s)
 {
     whole_seconds_f_ = s.whole_seconds_f_;
-    itrans_p_ = s.itrans_p_ ? new Input_translator( *s.itrans_p_ ) : 0;
+    itrans_p_ = s.itrans_p_ ? new Input_translator (*s.itrans_p_) : 0;
     outfile_str_ = s.outfile_str_;
 }
 
@@ -48,47 +48,47 @@ Midi_def::~Midi_def()
 }
 
 Real
-Midi_def::duration_to_seconds_f( Moment mom )
+Midi_def::duration_to_seconds_f (Moment mom)
 {
-    if ( !mom )
+    if ( !mom)
        return 0;
     
-    return Moment( whole_seconds_f_ ) * mom;
+    return Moment (whole_seconds_f_) * mom;
 }
 
 Global_translator*
 Midi_def::get_global_translator_p() const
 {
-    return  itrans_p_->get_group_performer_p()->global_l();
+    return  itrans_p_->get_group_performer_p()->global_l ();
 }
 
 int
-Midi_def::get_tempo_i( Moment moment )
+Midi_def::get_tempo_i (Moment moment)
 {
-    return Moment( whole_seconds_f_ ) * Moment( 60 ) * moment;
+    return Moment (whole_seconds_f_) * Moment (60 ) * moment;
 }
 
 void
 Midi_def::print() const
 {
 #ifndef NPRINT
-    mtor << "Midi {";
-    mtor << "4/min: " << Real( 60 ) / ( whole_seconds_f_ * 4 );
-    mtor << "out: " << outfile_str_;
-    mtor << "}\n";
+    DOUT << "Midi {";
+    DOUT << "4/min: " << Real (60) / ( whole_seconds_f_ * 4 );
+    DOUT << "out: " << outfile_str_;
+    DOUT << "}\n";
 #endif
 }
 
 void
-Midi_def::set( Input_translator* itrans_p )
+Midi_def::set (Input_translator* itrans_p)
 {
     delete itrans_p_;
     itrans_p_ = itrans_p;
 }
 
 void
-Midi_def::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;
+    whole_seconds_f_ = Moment (count_per_minute_i) / Moment (60 ) / moment;
 }