release: 1.3.144

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index acbde20646c9bde827d12fc86b6d5b15ed1cbd62..d9637672fbfca8b2c95cc207a1c126ea6458b5ad 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
          Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -15,7 +15,7 @@
 #include "midi-stream.hh"
 #include "debug.hh"
 
-Midi_note_event::Midi_note_event() 
+Midi_note_event::Midi_note_event () 
 { 
   ignore_b_ = false;
 }
@@ -34,7 +34,7 @@ Midi_walker::Midi_walker (Audio_staff* audio_staff_l, Midi_track* track_l)
   last_mom_ = 0;
 }
 
-Midi_walker::~Midi_walker()
+Midi_walker::~Midi_walker ()
 { 
   // ugh
   do_stop_notes (last_mom_ + Moment (10, 1));
@@ -48,26 +48,43 @@ Midi_walker::do_start_note (Midi_note* note_p)
 {
   Audio_item* ptr = (*item_l_arr_l_)[index_];
   Moment stop_mom = note_p->length_mom () + ptr->audio_column_l_->at_mom ();
-  for (int i=0; i < stop_note_queue.size(); i++) 
+
+  bool play_start = true;
+  for (int i=0; i < stop_note_queue.size (); i++) 
     {
-      if (stop_note_queue[i].val->pitch_i() == note_p->pitch_i ()) 
+      /* if this pith already in queue */
+      if (stop_note_queue[i].val->pitch_i () == note_p->pitch_i ()) 
        {
          if (stop_note_queue[i].key < stop_mom)
-           stop_note_queue[i].ignore_b_ = true;
-         else {
-           // skip the stopnote
-           delete note_p;
-           return;
+           {
+             /* let stopnote in queue be ignored,
+              new stop note wins */
+             stop_note_queue[i].ignore_b_ = true;
+             /* don't replay start note, */
+             play_start = false;
+             break;
+           }
+         else
+           {
+             /* skip this stopnote,
+                don't play the start note */
+             delete note_p;
+             note_p = 0;
+             break;
          }
        }
     }
 
-  Midi_note_event e;
-  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);
+  if (note_p)
+    {
+      Midi_note_event e;
+      e.val = new Midi_note_off (note_p);
+      e.key = stop_mom;
+      stop_note_queue.insert (e);
+
+      if (play_start)
+       output_event (ptr->audio_column_l_->at_mom (), note_p);
+    }
 }
 
 /**
@@ -76,9 +93,9 @@ Midi_walker::do_start_note (Midi_note* note_p)
 void
 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();
+      Midi_note_event e = stop_note_queue.get ();
       if (e.ignore_b_)
        {
          delete e.val;
@@ -86,7 +103,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);
     }
@@ -104,29 +121,38 @@ Midi_walker::output_event (Moment now_mom, Midi_item* l)
 }
 
 void
-Midi_walker::process()
+Midi_walker::process ()
 {
-  Audio_item* ptr = (*item_l_arr_l_)[index_];
-  do_stop_notes (ptr->audio_column_l_->at_mom ());
-
-  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);
+  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.
+    where's the leak?  Everything goet to Midi_track, in a killing_cons.
+ */
+  if (Midi_item* midi_p = Midi_item::midi_p (audio_p))
+    {
+      midi_p->channel_i_ = track_l_->channel_i_;
+      //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)
+Midi_walker::operator ++ (int)
 {
-  assert (ok());
+  assert (ok ());
   index_++;
 }