release: 1.3.8

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 2caa2025767833da9e9f98ce3e852b50bca08df2..48c408aaa76a2c4309e0da79396db896e5328745 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -66,7 +66,7 @@ Midi_walker::do_start_note (Midi_note* note_p)
   e.val = new Midi_note_off (note_p);
   e.key = stop_mom;
   stop_note_queue.insert (e);
-  
+      
   output_event (ptr->audio_column_l_->at_mom (), note_p);
 }
 
@@ -86,7 +86,7 @@ Midi_walker::do_stop_notes (Moment max_mom)
        }
       
       Moment stop_mom = e.key;
-      Midi_note_off* note_p = e.val;
+      Midi_note* note_p = e.val;
        
       output_event (stop_mom, note_p);
     }
@@ -106,27 +106,32 @@ Midi_walker::output_event (Moment now_mom, Midi_item* l)
 void
 Midi_walker::process()
 {
-  Audio_item* ptr = (*item_l_arr_l_)[index_];
-  do_stop_notes (ptr->audio_column_l_->at_mom ());
+  Audio_item* audio_p = (*item_l_arr_l_)[index_];
+  do_stop_notes (audio_p->audio_column_l_->at_mom ());
 
   /*
     THIS IS A MEMORY LEAK. FIXME.
    */
-  Midi_item* p = ptr->midi_item_p ();
-  if (!p)
-    return;
-  p->channel_i_ = track_l_->number_i_;
-  
-  if (Midi_note *mi = dynamic_cast<Midi_note*>(p))
-    do_start_note (mi);
-  else
-    output_event (ptr->audio_column_l_->at_mom (), p);
+  //Midi_item* p = ptr->midi_item_p ();
+  if (Midi_item* midi_p = Midi_item::midi_p (audio_p))
+    {
+      midi_p->channel_i_ = track_l_->number_i_;
+      if (Midi_note* note_p = dynamic_cast<Midi_note*>(midi_p))
+       {
+         if (note_p->length_mom ())
+           do_start_note (note_p);
+       }
+      else
+       output_event (audio_p->audio_column_l_->at_mom (), midi_p);
+    }
 }
+
 bool
 Midi_walker::ok () const
 {
   return index_ <item_l_arr_l_->size ();
 }
+
 void
 Midi_walker::operator ++(int)
 {