X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmidi-walker.cc;h=59a2c387239290c2d399d16d41aece2c1814e421;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=3214b3202442169c6f5e55c603dfbb46c05b673e;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 3214b32024..59a2c38723 100644
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
   Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -46,21 +46,23 @@ compare (Midi_note_event const &left, Midi_note_event const &right)
 }
 
 bool
-audio_item_less (Audio_item * const a,
-		 Audio_item * const b)
+audio_item_less (Audio_item *const a,
+                 Audio_item *const b)
 {
-  return a->get_column ()->when_ <  b->get_column ()->when_;
+  return a->get_column ()->when_ < b->get_column ()->when_;
 }
 
-Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track,
-			  int channel)
+Midi_walker::Midi_walker (Audio_staff *audio_staff, Midi_track *track)
 {
-  channel_ = channel;
   track_ = track;
   index_ = 0;
   items_ = audio_staff->audio_items_;
   vector_sort (items_, audio_item_less);
-  last_tick_ = 0;
+  //Pieces that begin with grace notes start at negative times. This
+  //is OK - MIDI output doesn't use absolute ticks, only differences.
+  last_tick_ = items_.empty () ? 0 : items_[0]->audio_column_->ticks ();
+  percussion_ = audio_staff->percussion_;
+  merge_unisons_ = audio_staff->merge_unisons_;
 }
 
 Midi_walker::~Midi_walker ()
@@ -82,34 +84,46 @@ 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 ();
-
-  bool play_start = true;
+  int now_ticks = ptr->audio_column_->ticks ();
+  int stop_ticks = int (moment_to_real (note->audio_->length_mom_) *
+                        Real (384 * 4)) + now_ticks;
   for (vsize i = 0; i < stop_note_queue.size (); i++)
     {
-      /* if this pith already in queue */
+      /* if this pitch already in queue */
       if (stop_note_queue[i].val->get_semitone_pitch ()
-	  == note->get_semitone_pitch ())
-	{
-	  if (stop_note_queue[i].key < stop_ticks)
-	    {
-	      /* let stopnote in queue be ignored,
-		 new stop note wins */
-	      stop_note_queue[i].ignore_ = true;
-
-	      /* don't replay start note, */
-	      play_start = false;
-	      break;
-	    }
-	  else
-	    {
-	      /* skip this stopnote,
-		 don't play the start note */
-	      note = 0;
-	      break;
-	    }
-	}
+          == note->get_semitone_pitch ())
+        {
+          int queued_ticks
+            = stop_note_queue[i].val->audio_->audio_column_->ticks ();
+          // If the two notes started at the same time, or option is set,
+          if (now_ticks == queued_ticks || merge_unisons_)
+            {
+              // merge them.
+              if (stop_note_queue[i].key < stop_ticks)
+                {
+                  Midi_note_event e;
+                  e.val = stop_note_queue[i].val;
+                  e.key = stop_ticks;
+                  stop_note_queue[i].ignore_ = true;
+                  stop_note_queue.insert (e);
+                }
+              note = 0;
+              break;
+            }
+          else
+            {
+              // A note was played that interruped a played note.
+              // Stop the old note, and continue to the greatest moment
+              // between the two.
+              if (stop_note_queue[i].key > stop_ticks)
+                {
+                  stop_ticks = stop_note_queue[i].key;
+                }
+              output_event (now_ticks, stop_note_queue[i].val);
+              stop_note_queue[i].ignore_ = true;
+              break;
+            }
+        }
     }
 
   if (note)
@@ -118,11 +132,10 @@ Midi_walker::do_start_note (Midi_note *note)
       e.val = new Midi_note_off (note);
 
       midi_events_.push_back (e.val);
-      e.key = int (stop_ticks);
+      e.key = stop_ticks;
       stop_note_queue.insert (e);
 
-      if (play_start)
-	output_event (ptr->audio_column_->ticks (), note);
+      output_event (now_ticks, note);
     }
 }
 
@@ -133,9 +146,9 @@ Midi_walker::do_stop_notes (int max_ticks)
     {
       Midi_note_event e = stop_note_queue.get ();
       if (e.ignore_)
-	{
-	  continue;
-	}
+        {
+          continue;
+        }
 
       int stop_ticks = e.key;
       Midi_note *note = e.val;
@@ -167,27 +180,30 @@ void
 Midi_walker::process ()
 {
   Audio_item *audio = items_[index_];
-  do_stop_notes (audio->audio_column_->ticks ());
+  Audio_column *col = audio->get_column ();
+  do_stop_notes (col->ticks ());
 
   if (Midi_item *midi = get_midi (audio))
     {
-      if (Midi_channel_item *mci = dynamic_cast<Midi_channel_item*> (midi))
-	mci->channel_ = channel_;
-      
       if (Midi_note *note = dynamic_cast<Midi_note *> (midi))
-	{
-	  if (note->audio_->length_mom_.to_bool ())
-	    do_start_note (note);
-	}
+        {
+          if (note->audio_->length_mom_.to_bool ())
+            do_start_note (note);
+        }
       else
-	output_event (audio->audio_column_->ticks (), midi);
+        output_event (audio->audio_column_->ticks (), midi);
     }
 }
 
-Midi_item*
+Midi_item *
 Midi_walker::get_midi (Audio_item *i)
 {
   Midi_item *mi = Midi_item::get_midi (i);
+
+  if (percussion_)
+    if (Midi_channel_item *mci = dynamic_cast<Midi_channel_item *> (mi))
+      mci->channel_ = 9;
+
   midi_events_.push_back (mi);
   return mi;
 }
@@ -199,7 +215,7 @@ Midi_walker::ok () const
 }
 
 void
-Midi_walker::operator ++ (int)
+Midi_walker::operator ++(int)
 {
   assert (ok ());
   index_++;