release: 0.1.8

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

diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc
index 88cd6b724d5e88b1aab9659ecbcb708c9aebed9f..1827eb39e20496723714bd9f6c7795a29f44e74f 100644 (file)
--- a/lily/midi-walker.cc
+++ b/lily/midi-walker.cc
@@ -1,95 +1,110 @@
 /*
   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 Han-Wen Nienhuys <hanwen@stack.nl>
+           Jan Nieuwenhuizen <jan@digicash.com>
+ */
 
-#include "musical-request.hh"
-#include "p-score.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)
 {
-    track_l_ = track_l;
-    last_moment_= 0;
+    return sign (left.key - right.key);
 }
 
-/**
-  output notestop events for all notes which end before #max_moment#
- */
-void
-Midi_walker::do_stop_notes(Moment max_moment)
+Midi_walker::Midi_walker (Audio_staff* audio_staff_l, Midi_track* track_l)
+    : PCursor<Audio_item*>( audio_staff_l->audio_item_l_list_)
 {
-    while (stop_notes.size() && stop_notes.front_idx() <= max_moment) {
-       Moment stop_moment = stop_notes.front_idx();
-       Melodic_req * req_l = stop_notes.get();
-       
-       Midi_note note(req_l, track_l_->number_i_, false);
-       output_event(note, stop_moment);
-    }
+    track_l_ = track_l;
+    last_mom_ = 0;
+}
+
+Midi_walker::~Midi_walker()
+{ 
+    // ugh
+    do_stop_notes (last_mom_ + Moment (10, 1) );
 }
+
 /**
-  Find out if start_note event is needed,  and do it if needed.
+  Find out if start_note event is needed, and do it if needed.
  */
 void 
-Midi_walker::do_start_note(Note_req*note_l)
+Midi_walker::do_start_note (Midi_note* note_l)
 {
-    Moment stop=note_l->duration() + ptr()->when();
-    for(int i=0; i < stop_notes.size(); i++)
-       if (stop_notes.value_arr_[i]->melodic()->pitch() ==
-           note_l->pitch()) {
-            if ( stop_notes.indices_arr_[i] < stop){
-                
-                stop_notes.del(i);
-                return ;  // removing this gives a feature ( ${c2 c4}$ output correctly)
-            }
-            else
-                return; // skip the stop note 
-            break;// do the stop note               
+    Moment stop_mom = note_l->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_l->pitch_i ()) {
+           if ( stop_note_queue[ i ].key < stop_mom)
+               stop_note_queue[ i ].ignore_b_ = true;
+           else // skip the stopnote 
+               return; 
        }
+    }
+
+    Midi_note_event e;
+    e.val = new Midi_note_off (note_l);
+    e.key = stop_mom;
+    stop_note_queue.insert (e);
     
-    stop_notes.enter(note_l,  stop);
-    Midi_note note(note_l, track_l_->number_i_, true);
-    output_event(note, ptr()->when());
+    output_event (ptr()->audio_column_l_->at_mom (), note_l);
 }
 
+/**
+  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) {
+       Midi_note_event e = stop_note_queue.get();
+       if ( e.ignore_b_) 
+           continue;
+       
+       Moment stop_mom = e.key;
+       Midi_note_off* note_l = e.val;
+       
+       output_event (stop_mom, note_l);
+    }
+}
 
-/** 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;
-       do_start_note(note_l);
+    Midi_item* p = ptr()->midi_item_p ();
+    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);
        
-    }
+    delete p;
 }
 
-Midi_walker::~Midi_walker()
-{
-    do_stop_notes( last_moment_ + Moment(10,1)); // ugh
-}