release: 1.1.54

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index aea8fcc0d7091e3ce3b423d155bbc821f0af05c0..48c408aaa76a2c4309e0da79396db896e5328745 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -3,8 +3,8 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
-         Jan Nieuwenhuizen <jan@digicash.com>
+  (c)  1997--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+         Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
 #include "midi-walker.hh"
@@ -27,42 +27,47 @@ compare (Midi_note_event const& left, Midi_note_event const& right)
 }
 
 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;
+  index_= 0;
+  item_l_arr_l_ = &audio_staff_l->audio_item_l_arr_;
   last_mom_ = 0;
 }
 
 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_p)
 {
-  Moment stop_mom = note_l->duration() + ptr ()->audio_column_l_->at_mom ();
-  for ( int i=0; i < stop_note_queue.size(); i++) 
+  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++) 
     {
-       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; 
+      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;
          }
+       }
     }
 
   Midi_note_event e;
-  e.val = new Midi_note_off (note_l);
+  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_l);
+      
+  output_event (ptr->audio_column_l_->at_mom (), note_p);
 }
 
 /**
@@ -71,16 +76,19 @@ Midi_walker::do_start_note (Midi_note* note_l)
 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();
-       if ( e.ignore_b_) 
-           continue;
+      Midi_note_event e = stop_note_queue.get();
+      if (e.ignore_b_)
+       {
+         delete e.val;
+         continue;
+       }
+      
+      Moment stop_mom = e.key;
+      Midi_note* note_p = e.val;
        
-       Moment stop_mom = e.key;
-       Midi_note_off* note_l = e.val;
-       
-       output_event (stop_mom, note_l);
+      output_event (stop_mom, note_p);
     }
 }
 
@@ -98,18 +106,35 @@ Midi_walker::output_event (Moment now_mom, Midi_item* l)
 void
 Midi_walker::process()
 {
-  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 ());
 
-  Midi_item* p = ptr()->midi_item_p ();
-  if ( !p )
-       return;
-  p->channel_i_ = track_l_->number_i_;
-  
-  if ( p->name() != Midi_note::static_name ())
-       output_event (ptr()->audio_column_l_->at_mom (), p);
-  else
-       do_start_note ((Midi_note*)p);
-       
-  delete p;
+  /*
+    THIS IS A MEMORY LEAK. FIXME.
+   */
+  //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)
+{
+  assert (ok());
+  index_++;
+}