X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=abc333d5eab303ac9d68191d3fdf597685b75ef3;hb=03166b077427a230be791d5555c2f24fcdfcc4be;hp=81489c2ad0cfc7fe8045bce9a107c7e18eb21206;hpb=1cf3d59c1559fb9774c4c1c8cae155cfe54a927c;p=lilypond.git

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 81489c2ad0..abc333d5ea 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--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
          Jan Nieuwenhuizen <janneke@gnu.org>
  */
 
@@ -13,9 +13,9 @@
 #include "audio-staff.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
-#include "debug.hh"
+#include "warn.hh"
 
-Midi_note_event::Midi_note_event() 
+Midi_note_event::Midi_note_event () 
 { 
   ignore_b_ = false;
 }
@@ -23,49 +23,76 @@ Midi_note_event::Midi_note_event()
 int
 compare (Midi_note_event const& left, Midi_note_event const& right)
 {
-  return sign (left.key - right.key);
+  Moment m =   (left.key - right.key);
+
+  if (m<0)
+    return -1;
+  else if (m > 0)
+    return 1;
+  else
+    return 0;
 }
 
-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, Midi_track* track)
 {
-  track_l_ = track_l;
+  track_ = track;
+  index_= 0;
+  items_ = &audio_staff->audio_items_;
+
   last_mom_ = 0;
 }
 
-Midi_walker::~Midi_walker()
+Midi_walker::~Midi_walker ()
 { 
   // ugh
-  do_stop_notes (last_mom_ + Moment (10, 1));
+  do_stop_notes (last_mom_ + Moment (Rational (10, 1)));
 }
 
 /**
   Find out if start_note event is needed, and do it if needed.
  */
 void 
-Midi_walker::do_start_note (Midi_note* note_p)
+Midi_walker::do_start_note (Midi_note* note)
 {
-  Moment stop_mom = note_p->duration() + ptr ()->audio_column_l_->at_mom ();
-  for (int i=0; i < stop_note_queue.size(); i++) 
+  Audio_item* ptr = (*items_)[index_];
+  Moment stop_mom = note->get_length () + ptr->audio_column_->at_mom ();
+
+  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->get_pitch () == note->get_pitch ()) 
 	{
-	  if (stop_note_queue[ i ].key < stop_mom)
-	    stop_note_queue[ i ].ignore_b_ = true;
-	  else {
-	    // skip the stopnote
-	    delete note_p;
-	    return;
+	  if (stop_note_queue[i].key < stop_mom)
+	    {
+	      /* 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;
+	      note = 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)
+    {
+      Midi_note_event e;
+      e.val = new Midi_note_off (note);
+      e.key = stop_mom;
+      stop_note_queue.insert (e);
+
+      if (play_start)
+	output_event (ptr->audio_column_->at_mom (), note);
+    }
 }
 
 /**
@@ -74,9 +101,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;
@@ -84,9 +111,9 @@ Midi_walker::do_stop_notes (Moment max_mom)
 	}
       
       Moment stop_mom = e.key;
-      Midi_note_off* note_p = e.val;
+      Midi_note* note = e.val;
 	
-      output_event (stop_mom, note_p);
+      output_event (stop_mom, note);
     }
 }
 
@@ -97,23 +124,50 @@ void
 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);
+  last_mom_ = now_mom;
+
+  /*
+    this is not correct, but at least it doesn't crash when you
+    start with graces
+   */
+  if (delta_t < Moment(0))
+    {
+      delta_t = Moment (0);
+    }
+
+  
+  track_->add (delta_t, l);
 }
 
 void
-Midi_walker::process()
+Midi_walker::process ()
 {
-  do_stop_notes (ptr()->audio_column_l_->at_mom ());
+  Audio_item* audio = (*items_)[index_];
+  do_stop_notes (audio->audio_column_->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);
+  if (Midi_item* midi = Midi_item::get_midi (audio))
+    {
+      midi->channel_ = track_->channel_;
+      //midi->channel_ = track_->number_;
+      if (Midi_note* note = dynamic_cast<Midi_note*> (midi))
+	{
+	  if (note->get_length ().to_bool ())
+	    do_start_note (note);
+	}
+      else
+	output_event (audio->audio_column_->at_mom (), midi);
+    }
 }
 
+bool
+Midi_walker::ok () const
+{
+  return index_ <items_->size ();
+}
+
+void
+Midi_walker::operator ++ (int)
+{
+  assert (ok ());
+  index_++;
+}