X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=97a70252b385fb33fd69511088ba18ff78d4513c;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=941e64c282932e753a97c1aa494327d339929ef8;hpb=e172d5758ac4e3755640dac9374bd9e7ca0c6ed6;p=lilypond.git

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 941e64c282..97a70252b3 100644
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 1997--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -12,6 +12,7 @@
 #include "audio-column.hh"
 #include "audio-staff.hh"
 #include "midi-item.hh"
+#include "midi-chunk.hh"
 #include "midi-stream.hh"
 #include "warn.hh"
 
@@ -53,9 +54,14 @@ Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track,
 
 Midi_walker::~Midi_walker ()
 {
-  do_stop_notes (INT_MAX);
+  junk_pointers (midi_events_);
 }
 
+void
+Midi_walker::finalize ()
+{
+  do_stop_notes (INT_MAX);
+}
 
 /**
    Find out if start_note event is needed, and do it if needed.
@@ -64,6 +70,7 @@ void
 Midi_walker::do_start_note (Midi_note *note)
 {
   Audio_item *ptr = items_[index_];
+  assert (note->audio_ == ptr);
   int stop_ticks = int (moment_to_real (note->audio_->length_mom_) * Real (384 * 4))
     + ptr->audio_column_->ticks ();
 
@@ -88,7 +95,6 @@ Midi_walker::do_start_note (Midi_note *note)
 	    {
 	      /* skip this stopnote,
 		 don't play the start note */
-	      delete note;
 	      note = 0;
 	      break;
 	    }
@@ -99,6 +105,8 @@ Midi_walker::do_start_note (Midi_note *note)
     {
       Midi_note_event e;
       e.val = new Midi_note_off (note);
+
+      midi_events_.push_back (e.val);
       e.key = int (stop_ticks);
       stop_note_queue.insert (e);
 
@@ -107,9 +115,6 @@ Midi_walker::do_start_note (Midi_note *note)
     }
 }
 
-/**
-   Output note events for all notes which end before #max_mom#
-*/
 void
 Midi_walker::do_stop_notes (int max_ticks)
 {
@@ -118,7 +123,6 @@ Midi_walker::do_stop_notes (int max_ticks)
       Midi_note_event e = stop_note_queue.get ();
       if (e.ignore_)
 	{
-	  delete e.val;
 	  continue;
 	}
 
@@ -154,7 +158,7 @@ Midi_walker::process ()
   Audio_item *audio = items_[index_];
   do_stop_notes (audio->audio_column_->ticks ());
 
-  if (Midi_item *midi = Midi_item::get_midi (audio))
+  if (Midi_item *midi = get_midi (audio))
     {
       if (Midi_channel_item *mci = dynamic_cast<Midi_channel_item*> (midi))
 	mci->channel_ = channel_;
@@ -169,6 +173,14 @@ Midi_walker::process ()
     }
 }
 
+Midi_item*
+Midi_walker::get_midi (Audio_item *i)
+{
+  Midi_item *mi = Midi_item::get_midi (i);
+  midi_events_.push_back (mi);
+  return mi;
+}
+
 bool
 Midi_walker::ok () const
 {