release: 0.1.8

[lilypond.git] / lily / audio-score.cc

diff --git a/lily/audio-score.cc b/lily/audio-score.cc
index 27f82a074699a413b34df8070d406ed297b77e97..57f012e2332aeee71c6af769d4837bea08c1a293 100644 (file)
--- a/lily/audio-score.cc
+++ b/lily/audio-score.cc
@@ -19,89 +19,89 @@
 #include "audio-score.hh"
 #include "score.hh"
 
-Audio_score::Audio_score( Score* l )
+Audio_score::Audio_score (Score* l)
 {
     score_l_ = l;
 }
 
 void
-Audio_score::add( Audio_column* p )
+Audio_score::add (Audio_column* p)
 {
     p->audio_score_l_ = this;
-    audio_column_p_list_.bottom().add(p);
+    audio_column_p_list_.bottom().add (p);
 }
 
 void
-Audio_score::output( Midi_stream& midi_stream_r )
+Audio_score::output (Midi_stream& midi_stream_r)
 {
     int tracks_i = audio_staff_l_list_.size() + 1;
     // ugh
     int clocks_per_4_i = 384;
-    midi_stream_r << Midi_header( 1, tracks_i, clocks_per_4_i );
-    output_header_track( midi_stream_r );
+    midi_stream_r << Midi_header (1, tracks_i, clocks_per_4_i);
+    output_header_track (midi_stream_r);
     int n = 1;
-    for ( PCursor<Audio_staff*> i( audio_staff_l_list_ ); i.ok(); i++ )
-       i->output( midi_stream_r, n++ );
+    for ( PCursor<Audio_staff*> i (audio_staff_l_list_); i.ok(); i++ )
+       i->output (midi_stream_r, n++);
 }
 
 void
-Audio_score::output_header_track( Midi_stream& midi_stream_r )
+Audio_score::output_header_track (Midi_stream& midi_stream_r)
 {
     Midi_track midi_track;
     
-    time_t t = time( 0 );
+    time_t t = time (0);
 
     // perhaps multiple text events?
-    String str = String( "Creator: " ) + get_version_str() + "\n";
+    String str = String ("Creator: ") + get_version_str() + "\n";
 
-    Midi_text creator( Midi_text::TEXT, str );
-    midi_track.add( Moment( 0 ), &creator );
+    Midi_text creator (Midi_text::TEXT, str);
+    midi_track.add (Moment (0), &creator );
 
     str = "Automatically generated at ";
-    str += ctime( &t );
-    str = str.left_str( str.length_i() - 1 );
+    str += ctime (&t);
+    str = str.left_str (str.length_i() - 1);
     str += "\n";
-    Midi_text generate( Midi_text::TEXT, str );
-    midi_track.add( Moment( 0 ), &generate );
+    Midi_text generate (Midi_text::TEXT, str);
+    midi_track.add (Moment (0), &generate );
 
     str = "from musical definition: ";
 
     str += score_l_->location_str();
-    Midi_text from( Midi_text::TEXT, str );
-    midi_track.add( Moment( 0 ), &from );
+    Midi_text from (Midi_text::TEXT, str);
+    midi_track.add (Moment (0), &from );
 
-    Midi_text track_name( Midi_text::TRACK_NAME, "Track " 
-                         + String_convert::i2dec_str( 0, 0, '0' ) );
-    midi_track.add( Moment( 0 ), &track_name );
+    Midi_text track_name (Midi_text::TRACK_NAME, "Track " 
+                         + String_convert::i2dec_str (0, 0, '0') );
+    midi_track.add (Moment (0), &track_name );
 
-    Midi_tempo tempo( score_l_->midi_p_->get_tempo_i( Moment( 1, 4 ) ) );
-    midi_track.add( Moment(0), &tempo);
+    Midi_tempo tempo (score_l_->midi_p_->get_tempo_i (Moment (1, 4) ) );
+    midi_track.add (Moment (0), &tempo);
 
     midi_stream_r  << midi_track;
 }
 
 void
-Audio_score::add_staff( Audio_staff* l )
+Audio_score::add_staff (Audio_staff* l)
 {
-    audio_staff_l_list_.bottom().add( l );
+    audio_staff_l_list_.bottom().add (l);
 }
 
 void
-Audio_score::add(Audio_element *p)
+Audio_score::add (Audio_element *p)
 {
-    audio_elem_p_list_.bottom().add( p);
+    audio_elem_p_list_.bottom().add (p);
 }
 
 void
 Audio_score::print() const
 {    
 #ifndef NPRINT
-    mtor << "Audio_score { ";
+    DOUT << "Audio_score { ";
     score_l_->midi_p_->print();
-    mtor << "\ncolumns: ";
-    for ( PCursor<Audio_column*> i( audio_column_p_list_ ); i.ok(); i++ )
+    DOUT << "\ncolumns: ";
+    for ( PCursor<Audio_column*> i (audio_column_p_list_); i.ok(); i++ )
        i->print();
-    mtor << "}\n";
+    DOUT << "}\n";
 #endif 
 }