release: 0.1.8

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 968aab74cfbe03c33ba3bbebd9799a85826ec42b..1827eb39e20496723714bd9f6c7795a29f44e74f 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -21,13 +21,13 @@ Midi_note_event::Midi_note_event()
 }
 
 int
-compare( Midi_note_event const& left, Midi_note_event const& right )
+compare (Midi_note_event const& left, Midi_note_event const& right)
 {
-    return sign( left.key - right.key );
+    return sign (left.key - right.key);
 }
 
-Midi_walker::Midi_walker( Audio_staff* audio_staff_l, Midi_track* track_l )
-    : PCursor<Audio_item*>( audio_staff_l->audio_item_l_list_ )
+Midi_walker::Midi_walker (Audio_staff* audio_staff_l, Midi_track* track_l)
+    : PCursor<Audio_item*>( audio_staff_l->audio_item_l_list_)
 {
     track_l_ = track_l;
     last_mom_ = 0;
@@ -36,19 +36,19 @@ Midi_walker::Midi_walker( Audio_staff* audio_staff_l, Midi_track* track_l )
 Midi_walker::~Midi_walker()
 { 
     // ugh
-    do_stop_notes( last_mom_ + Moment( 10, 1 ) );
+    do_stop_notes (last_mom_ + Moment (10, 1) );
 }
 
 /**
   Find out if start_note event is needed, and do it if needed.
  */
 void 
-Midi_walker::do_start_note( Midi_note* note_l )
+Midi_walker::do_start_note (Midi_note* note_l)
 {
-    Moment stop_mom = note_l->duration() + ptr()->audio_column_l_->at_mom();
-    for ( int i=0; i < stop_note_queue.size(); i++ ) {
-       if ( stop_note_queue[ i ].val->pitch_i() == note_l->pitch_i() ) {
-           if ( stop_note_queue[ i ].key < stop_mom )
+    Moment stop_mom = note_l->duration() + ptr ()->audio_column_l_->at_mom ();
+    for ( int i=0; i < stop_note_queue.size(); i++) {
+       if ( stop_note_queue[ i ].val->pitch_i() == note_l->pitch_i ()) {
+           if ( stop_note_queue[ i ].key < stop_mom)
                stop_note_queue[ i ].ignore_b_ = true;
            else // skip the stopnote 
                return; 
@@ -56,28 +56,28 @@ Midi_walker::do_start_note( Midi_note* note_l )
     }
 
     Midi_note_event e;
-    e.val = new Midi_note_off( note_l );
+    e.val = new Midi_note_off (note_l);
     e.key = stop_mom;
-    stop_note_queue.insert( e );
+    stop_note_queue.insert (e);
     
-    output_event( ptr()->audio_column_l_->at_mom(), note_l );
+    output_event (ptr()->audio_column_l_->at_mom (), note_l);
 }
 
 /**
   Output note events for all notes which end before #max_mom#
  */
 void
-Midi_walker::do_stop_notes( Moment max_mom )
+Midi_walker::do_stop_notes (Moment max_mom)
 {
-    while ( stop_note_queue.size() && stop_note_queue.front().key <= max_mom ) {
+    while ( stop_note_queue.size() && stop_note_queue.front ().key <= max_mom) {
        Midi_note_event e = stop_note_queue.get();
-       if ( e.ignore_b_ ) 
+       if ( e.ignore_b_) 
            continue;
        
        Moment stop_mom = e.key;
        Midi_note_off* note_l = e.val;
        
-       output_event( stop_mom, note_l );
+       output_event (stop_mom, note_l);
     }
 }
 
@@ -85,27 +85,25 @@ Midi_walker::do_stop_notes( Moment max_mom )
   Advance the track to #now#, output the item, and adjust current "moment". 
  */
 void
-Midi_walker::output_event( Moment now_mom, Midi_item* l )
+Midi_walker::output_event (Moment now_mom, Midi_item* l)
 {
     Moment delta_t = now_mom - last_mom_ ;
     last_mom_ += delta_t;
-    track_l_->add( delta_t, l );
+    track_l_->add (delta_t, l);
 }
 
 void
 Midi_walker::process()
 {
-    do_stop_notes( ptr()->audio_column_l_->at_mom() );
+    do_stop_notes (ptr()->audio_column_l_->at_mom ());
 
-    Midi_item* p = ptr()->midi_item_p();
-    if ( !p )
-       return;
+    Midi_item* p = ptr()->midi_item_p ();
     p->channel_i_ = track_l_->number_i_;
     
-    if ( p->name() != Midi_note::static_name() )
-       output_event( ptr()->audio_column_l_->at_mom(), p );
+    if ( p->name() != Midi_note::static_name ())
+       output_event (ptr()->audio_column_l_->at_mom (), p);
     else
-       do_start_note( (Midi_note*)p );
+       do_start_note ((Midi_note*)p);
        
     delete p;
 }