X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=3bdc426be042bb8d83c3423924d79a125f82c289;hb=49ec27a164a91714ebf51989652520ec3f62b973;hp=abc333d5eab303ac9d68191d3fdf597685b75ef3;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index abc333d5ea..3bdc426be0 100644
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -3,29 +3,29 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c)  1997--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-         Jan Nieuwenhuizen <janneke@gnu.org>
- */
+  (c) 1997--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Jan Nieuwenhuizen <janneke@gnu.org>
+*/
 
 #include "midi-walker.hh"
+
 #include "audio-column.hh"
-#include "audio-item.hh"
 #include "audio-staff.hh"
 #include "midi-item.hh"
 #include "midi-stream.hh"
 #include "warn.hh"
 
-Midi_note_event::Midi_note_event () 
-{ 
+Midi_note_event::Midi_note_event ()
+{
   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)
 {
-  Moment m =   (left.key - right.key);
+  Moment m = (left.key - right.key);
 
-  if (m<0)
+  if (m < 0)
     return -1;
   else if (m > 0)
     return 1;
@@ -33,40 +33,43 @@ compare (Midi_note_event const& left, Midi_note_event const& right)
     return 0;
 }
 
-Midi_walker::Midi_walker (Audio_staff* audio_staff, Midi_track* track)
+Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track,
+			  int channel)
 {
+  channel_ = channel;
   track_ = track;
-  index_= 0;
+  index_ = 0;
   items_ = &audio_staff->audio_items_;
 
   last_mom_ = 0;
 }
 
 Midi_walker::~Midi_walker ()
-{ 
+{
   // ugh
   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)
+   Find out if start_note event is needed, and do it if needed.
+*/
+void
+Midi_walker::do_start_note (Midi_note *note)
 {
-  Audio_item* ptr = (*items_)[index_];
-  Moment stop_mom = note->get_length () + ptr->audio_column_->at_mom ();
+  Audio_item *ptr = (*items_)[index_];
+  Moment stop_mom = note->get_length () + ptr->audio_column_->when ();
 
   bool play_start = true;
-  for (int i=0; i < stop_note_queue.size (); i++) 
+  for (vsize i = 0; i < stop_note_queue.size (); i++)
     {
       /* if this pith already in queue */
-      if (stop_note_queue[i].val->get_pitch () == note->get_pitch ()) 
+      if (stop_note_queue[i].val->get_semitone_pitch ()
+	  == note->get_semitone_pitch ())
 	{
 	  if (stop_note_queue[i].key < stop_mom)
 	    {
 	      /* let stopnote in queue be ignored,
-	       new stop note wins */
+		 new stop note wins */
 	      stop_note_queue[i].ignore_b_ = true;
 	      /* don't replay start note, */
 	      play_start = false;
@@ -79,7 +82,7 @@ Midi_walker::do_start_note (Midi_note* note)
 	      delete note;
 	      note = 0;
 	      break;
-	  }
+	    }
 	}
     }
 
@@ -91,17 +94,17 @@ Midi_walker::do_start_note (Midi_note* note)
       stop_note_queue.insert (e);
 
       if (play_start)
-	output_event (ptr->audio_column_->at_mom (), note);
+	output_event (ptr->audio_column_->when (), note);
     }
 }
 
 /**
-  Output note events for all notes which end before #max_mom#
- */
+   Output note events for all notes which end before #max_mom#
+*/
 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_)
@@ -109,60 +112,59 @@ Midi_walker::do_stop_notes (Moment max_mom)
 	  delete e.val;
 	  continue;
 	}
-      
+
       Moment stop_mom = e.key;
-      Midi_note* note = e.val;
-	
+      Midi_note *note = e.val;
+
       output_event (stop_mom, note);
     }
 }
 
-/** 
-  Advance the track to #now#, output the item, and adjust current "moment". 
- */
+/**
+   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_ ;
+  Moment delta_t = now_mom - last_mom_;
   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);
-    }
+  */
+  if (delta_t < Moment (0))
+    delta_t = Moment (0);
 
-  
   track_->add (delta_t, l);
 }
 
 void
 Midi_walker::process ()
 {
-  Audio_item* audio = (*items_)[index_];
-  do_stop_notes (audio->audio_column_->at_mom ());
+  Audio_item *audio = (*items_)[index_];
+  do_stop_notes (audio->audio_column_->when ());
 
-  if (Midi_item* midi = Midi_item::get_midi (audio))
+  if (Midi_item *midi = Midi_item::get_midi (audio))
     {
-      midi->channel_ = track_->channel_;
+      if (Midi_channel_item *mci = dynamic_cast<Midi_channel_item*> (midi))
+	mci->channel_ = channel_;
+      
       //midi->channel_ = track_->number_;
-      if (Midi_note* note = dynamic_cast<Midi_note*> (midi))
+      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);
+	output_event (audio->audio_column_->when (), midi);
     }
 }
 
 bool
 Midi_walker::ok () const
 {
-  return index_ <items_->size ();
+  return index_ < items_->size ();
 }
 
 void