release: 1.1.1

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 801ba32e122588a3758ea0d6c44f3fee3f9d4494..90477a3009ac19e3702807b5e1ede691f4275d72 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -1,71 +1,119 @@
 /*
   midi-walker.cc -- implement Midi_walker
 
-  source file of the LilyPond music typesetter
+  source file of the GNU LilyPond music typesetter
 
-  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>, Jan Nieuwenhuizen <jan@digicash.com>
-*/
+  (c)  1997--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+         Jan Nieuwenhuizen <janneke@gnu.org>
+ */
 
-#include "musicalrequest.hh"
-#include "pscore.hh"
-#include "staff.hh"
 #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 "debug.hh"
-#include "staff-column.hh"
 
-Midi_walker::Midi_walker(Staff *st_l, Midi_track* track_l)
-    : PCursor<Staff_column*>(st_l->cols_)
+Midi_note_event::Midi_note_event() 
+{ 
+  ignore_b_ = false;
+}
+
+int
+compare (Midi_note_event const& left, Midi_note_event const& right)
+{
+  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_)
 {
-    track_l_ = track_l;
-    last_moment_= 0;
+  track_l_ = track_l;
+  last_mom_ = 0;
+}
+
+Midi_walker::~Midi_walker()
+{ 
+  // ugh
+  do_stop_notes (last_mom_ + Moment (10, 1));
 }
 
 /**
-  output notestop events for all notes which end before #max_moment#
+  Find out if start_note event is needed, and do it if needed.
+ */
+void 
+Midi_walker::do_start_note (Midi_note* note_p)
+{
+  Moment stop_mom = note_p->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_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_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_moment)
+Midi_walker::do_stop_notes (Moment max_mom)
 {
-    while (stop_notes.size() && stop_notes.front_idx() <= max_moment) {
-       Moment stop_moment = stop_notes.front_idx();
-       Melodic_req * req_l = stop_notes.get();
+  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;
        
-       Midi_note note(req_l, track_l_->number_i_, false);
-       output_event(note, stop_moment);
+      output_event (stop_mom, note_p);
     }
 }
-/** 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(Midi_item &i, Moment now)
+Midi_walker::output_event (Moment now_mom, Midi_item* l)
 {
-    Moment delta_t = now - last_moment_ ;
-    last_moment_ += delta_t;
-    track_l_->add(delta_t, &i );    
+  Moment delta_t = now_mom - last_mom_ ;
+  last_mom_ += delta_t;
+  track_l_->add (delta_t, l);
 }
 
 void
-Midi_walker::process_requests()
+Midi_walker::process()
 {
-    do_stop_notes(ptr()->when());
-    for ( int i = 0; i < ptr()->musicalreq_l_arr_.size(); i++ )  {
+  do_stop_notes (ptr()->audio_column_l_->at_mom ());
 
-       Rhythmic_req *n = ptr()->musicalreq_l_arr_[i]->rhythmic();
-       if ( !n)
-           continue;
-       Note_req * note_l = n->note();
-       if (!note_l)
-           continue;
-       
-       Midi_note note(note_l, track_l_->number_i_, true);
-       stop_notes.enter(note_l, n->duration() + ptr()->when() );
-       output_event(note, ptr()->when());
-    }
+  Midi_item* p = ptr()->midi_item_p ();
+  if (!p)
+    return;
+  p->channel_i_ = track_l_->number_i_;
+  
+  if (Midi_item *mi = dynamic_cast<Midi_note*>(p))
+    do_start_note (mi);
+  else
+    output_event (ptr()->audio_column_l_->at_mom (), p);
 }
 
-Midi_walker::~Midi_walker()
-{
-    do_stop_notes( last_moment_ + Moment(10,1)); // ugh
-}