patch::: 1.1.52.gp2

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 968aab74cfbe03c33ba3bbebd9799a85826ec42b..2caa2025767833da9e9f98ce3e852b50bca08df2 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"
@@ -17,67 +17,78 @@
 
 Midi_note_event::Midi_note_event() 
 { 
-    ignore_b_ = false;
+  ignore_b_ = false;
 }
 
 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)
 {
-    track_l_ = track_l;
-    last_mom_ = 0;
+  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 ) );
+  // ugh
+  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++ ) {
-       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; 
+  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_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.key = stop_mom;
-    stop_note_queue.insert( e );
-    
-    output_event( ptr()->audio_column_l_->at_mom(), note_l );
+  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);
 }
 
 /**
   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 ) {
-       Midi_note_event e = stop_note_queue.get();
-       if ( e.ignore_b_ ) 
-           continue;
-       
-       Moment stop_mom = e.key;
-       Midi_note_off* note_l = e.val;
+  while (stop_note_queue.size() && stop_note_queue.front ().key <= max_mom) 
+    {
+      Midi_note_event e = stop_note_queue.get();
+      if (e.ignore_b_)
+       {
+         delete e.val;
+         continue;
+       }
+      
+      Moment stop_mom = e.key;
+      Midi_note_off* note_p = e.val;
        
-       output_event( stop_mom, note_l );
+      output_event (stop_mom, note_p);
     }
 }
 
@@ -85,28 +96,40 @@ 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 );
+  Moment delta_t = now_mom - last_mom_ ;
+  last_mom_ += delta_t;
+  track_l_->add (delta_t, l);
 }
 
 void
 Midi_walker::process()
 {
-    do_stop_notes( ptr()->audio_column_l_->at_mom() );
+  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 ( 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 (!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);
+}
+bool
+Midi_walker::ok () const
+{
+  return index_ <item_l_arr_l_->size ();
+}
+void
+Midi_walker::operator ++(int)
+{
+  assert (ok());
+  index_++;
 }
-